summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-06-09 14:01:24 +0100
committerJacob Schatz <jschatz1@gmail.com>2016-06-09 17:20:57 -0400
commitef48dd01cfcd32ace716c716078d7ca5137cf0ca (patch)
tree5268c83844eae3183ffcb176250c14c1540133ee
parent4456b41b6a2355678d60dccb5982db518ea788ff (diff)
downloadgitlab-ce-ef48dd01cfcd32ace716c716078d7ca5137cf0ca.tar.gz
Checks based on whether data is loaded not undefined
-rw-r--r--app/assets/javascripts/gfm_auto_complete.js.coffee5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index 2c7a8fe2a3b..76c3083232b 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -3,6 +3,7 @@
window.GitLab ?= {}
GitLab.GfmAutoComplete =
dataLoading: false
+ dataLoaded: false
dataSource: ''
@@ -35,7 +36,7 @@ GitLab.GfmAutoComplete =
$.fn.atwho.default.callbacks.filter(query, data, searchKey)
beforeInsert: (value) ->
- if value.indexOf('undefined') is 1
+ if not GitLab.GfmAutoComplete.dataLoaded
@at
else
value
@@ -182,6 +183,8 @@ GitLab.GfmAutoComplete =
$.getJSON(dataSource)
loadData: (data) ->
+ @dataLoaded = true
+
# load members
@input.atwho 'load', '@', data.members
# load issues