diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-09 14:01:24 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-09 14:01:24 +0100 |
| commit | d572c0f5137b4123a989a65725682e62ed73e340 (patch) | |
| tree | 1be85b928751b323f23a91f0646877942ac845ed | |
| parent | 7e7bbad38bd4ef84be0ecea8888d566c65d9ec12 (diff) | |
| download | gitlab-ce-autocomplete-comment-fix.tar.gz | |
Checks based on whether data is loaded not undefinedautocomplete-comment-fix
| -rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js.coffee | 5 |
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 |