Fixed issue with unselecting mention. Closes ivirabyan#35

quevon24 · Jun 23, 2015 · d930934 · d930934
1 parent 241e9cd
commit d930934
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 79 deletions.
diff --git a/jquery.mentions.coffee b/jquery.mentions.coffee
@@ -46,15 +46,12 @@ $.widget( "ui.areacomplete", $.ui.autocomplete,
         after = value.substring(@end)
         newval = ui.item.value
         value = before + newval + after
-        if @overriden.select
-            ui.item.pos = @start
-            ui.value = value
-            if @overriden.select(event, ui) == false
-                return false
-
         @_value(value)
-        @element.change()
         Selection.set(@element, before.length + newval.length)
+
+        if @overriden.select
+            ui.item.pos = @start
+            @overriden.select(event, ui)
         return false
 
     focusCallback: ->
@@ -284,8 +281,9 @@ class MentionsInput extends MentionsBase
             return a.pos - b.pos
 
     _onSelect: (event, ui) =>
+        @_updateMentions()
         @_addMention(name: ui.item.value, pos: ui.item.pos, uid: ui.item.uid)
-        @value = ui.value
+        @_updateValue()
 
     _updateValue: =>
         value = @input.val()

diff --git a/jquery.mentions.js b/jquery.mentions.js