diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 21:47:45 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 21:47:45 +0000 |
| commit | 5f803f0fd1676c5a77eaa800c3036729bac0db98 (patch) | |
| tree | 0565ac46f962ae1a5e55421ae46706b34a8d0ad1 | |
| parent | 4fbb284cfd8a23ed3b754e0f168752c1ab211a7c (diff) | |
| parent | ef48dd01cfcd32ace716c716078d7ca5137cf0ca (diff) | |
| download | gitlab-ce-5f803f0fd1676c5a77eaa800c3036729bac0db98.tar.gz | |
Merge branch 'autocomplete-comment-fix' into 'master'
Checks for undefined when inserting autocomplete into textarea
## What does this MR do?
Correctly checks for undefined before inserting anything into the textarea when using autocomplete. This happens because the loading indicator tries to insert `@undefined` which we dont want to insert.
See merge request !4561
| -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 b13a431a52f..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') + 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 |