From 3b4e3fd87e3abdd7ead415e1b35f36572c2074b1 Mon Sep 17 00:00:00 2001
From: Dan Hansen <mokker1234@gmail.com>
Date: Mon, 16 Jan 2012 13:01:04 -0600
Subject: [PATCH] mentions now work for stream publisher

---
 public/javascripts/publisher.js               |  2 +-
 .../vendor/jquery.mentionsInput.js            | 28 +++++++++----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js
index 93eb6bc0d..576e9a72e 100644
--- a/public/javascripts/publisher.js
+++ b/public/javascripts/publisher.js
@@ -54,7 +54,7 @@ var Publisher = {
 
   clear: function(){
     $("#photodropzone").find('li').remove();
-    $("#publisher textarea").removeClass("with_attachments")
+    Publisher.input().removeClass("with_attachments")
       .css('paddingBottom', '')
       .mentionsInput("reset");
   },
diff --git a/public/javascripts/vendor/jquery.mentionsInput.js b/public/javascripts/vendor/jquery.mentionsInput.js
index befc47dfa..789dfd2ab 100644
--- a/public/javascripts/vendor/jquery.mentionsInput.js
+++ b/public/javascripts/vendor/jquery.mentionsInput.js
@@ -100,11 +100,12 @@
       elmMentionsOverlay.prependTo(elmWrapperBox);
     }
 
-    function updateValues() {
+    function updateNames() {
       var syntaxMessage = getInputBoxValue();
 
       _.each(mentionsCollection, function (mention) {
-        var textSyntax = settings.templates.mentionItemSyntax({ name : mention.name, type : 'contact', id : mention.id, mention : mention });
+        var textSyntax = settings.templates.mentionItemSyntax({ name : mention.name, type : 'contact', id : mention.id, mention: mention });
+
         syntaxMessage = syntaxMessage.replace(mention.name, textSyntax);
       });
 
@@ -162,7 +163,7 @@
 
       // Mentions & syntax message
       elmInputBox.val(updatedMessageText);
-      updateValues();
+      updateNames();
 
       // Set correct focus and selection
       elmInputBox.focus();
@@ -174,9 +175,9 @@
     }
 
     function onAutoCompleteItemClick(e) {
-      var elmTarget = $(this);
+      var mention = $(this).data("mention");
 
-      addMention(elmTarget.data("mention"));
+      addMention(mention);
 
       return false;
     }
@@ -186,7 +187,7 @@
     }
 
     function onInputBoxInput(e) {
-      updateValues();
+      updateNames();
       updateMentionsCollection();
       hideAutoComplete();
 
@@ -270,9 +271,9 @@
       elmAutocompleteList.show();
 
       // Filter items that has already been mentioned
-      var mentionValues = _.pluck(mentionsCollection, 'value');
+      var mentionedNames = _.pluck(mentionsCollection, 'name');
       results = _.reject(results, function (item) {
-        return _.include(mentionValues, item.name);
+        return _.include(mentionedNames, item.name);
       });
 
       if (!results.length) {
@@ -289,14 +290,12 @@
           'display' : utils.htmlEncode(item.name),
           'type'    : utils.htmlEncode(item.type),
           'content' : utils.highlightTerm(utils.htmlEncode((item.name)), query)
-        }));
+        })).data('mention', item);
 
-        if (index === 0) {
-          selectAutoCompleteItem(elmListItem);
+        if (index === 0) { 
+          selectAutoCompleteItem(elmListItem); 
         }
 
-        elmListItem.data("mention", item);
-
         if (settings.showAvatars) {
           var elmIcon;
 
@@ -342,10 +341,9 @@
       },
 
       reset : function () {
-        debugger;
         elmInputBox.val('');
         mentionsCollection = [];
-        updateValues();
+        updateNames();
       },
 
       getMentions : function (callback) {