fix gfm autocomplete for usernames

app/assets/javascripts/gfm_auto_complete.js.coffee

@@ -1,52 +1,58 @@
 # Creates the variables for setting up GFM auto-completion
 
 window.GitLab ?= {}
-GitLab.GfmAutoComplete ?= {}
+GitLab.GfmAutoComplete =
+  # Emoji
+  Emoji:
+    data: []
+    template: '<li data-value="${insert}">${name} <img alt="${name}" height="20" src="${image}" width="20" /></li>'
 
-# Emoji
+  # Team Members
-data      = []
+  Members:
-template  = "<li data-value='${insert}'>${name} <img alt='${name}' height='20' src='${image}' width='20' /></li>"
+    data: []
-GitLab.GfmAutoComplete.Emoji = {data, template}
+    url: ''
+    params:
+      private_token: ''
+      page: 1
+    template: '<li data-value="${username}">${username} <small>${name}</small></li>'
 
-# Team Members
+  # Add GFM auto-completion to all input fields, that accept GFM input.
-data      = []
+  setup: ->
-url     = '';
-params  = {private_token: '', page: 1}
-GitLab.GfmAutoComplete.Members = {data, url, params}
-
-# Add GFM auto-completion to all input fields, that accept GFM input.
-GitLab.GfmAutoComplete.setup = ->
     input = $('.js-gfm-input')
 
     # Emoji
     input.atWho ':',
-    data: GitLab.GfmAutoComplete.Emoji.data,
+      data: @Emoji.data
-    tpl: GitLab.GfmAutoComplete.Emoji.template
+      tpl: @Emoji.template
 
     # Team Members
-  input.atWho '@', (query, callback) ->
+    input.atWho '@',
-    (getMoreMembers = ->
+      tpl: @Members.template
-      $.getJSON(GitLab.GfmAutoComplete.Members.url, GitLab.GfmAutoComplete.Members.params)
+      callback: (query, callback) =>
-        .success (members) ->
+        (getMoreMembers = =>
+          $.getJSON(@Members.url, @Members.params).done (members) =>
             # pick the data we need
-          newMembersData = $.map(members, (m) -> m.name )
+            newMembersData = $.map(members, (m) ->
+              username: m.username
+              name: m.name
+            )
 
             # add the new page of data to the rest
-          $.merge(GitLab.GfmAutoComplete.Members.data, newMembersData)
+            $.merge(@Members.data, newMembersData)
 
             # show the pop-up with a copy of the current data
-          callback(GitLab.GfmAutoComplete.Members.data[..])
+            callback(@Members.data[..])
 
             # are we past the last page?
             if newMembersData.length is 0
               # set static data and stop callbacks
               input.atWho '@',
-              data: GitLab.GfmAutoComplete.Members.data
+                data: @Members.data
                 callback: null
             else
               # get next page
               getMoreMembers()
 
-      # so the next request gets the next page
+          # so the next callback requests the next page
-      GitLab.GfmAutoComplete.Members.params.page += 1
+          @Members.params.page += 1
         ).call()