diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-12-21 15:15:09 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-12-21 15:15:09 +0000 |
| commit | 845e2d3667ed697fea49123c9251226b1f7126ac (patch) | |
| tree | 2f9d5dd4308fa433e0d08a135558a0d844818f4f /app/assets/javascripts/gfm_auto_complete.js.es6 | |
| parent | 19981b15094a7f1ed8709b152c59fa51d1e3051d (diff) | |
| parent | a9f85d11a584a5a9ad99aaf6366f22fd6f6d0957 (diff) | |
| download | gitlab-ce-845e2d3667ed697fea49123c9251226b1f7126ac.tar.gz | |
Merge branch '25879-emoji-autocomplete-starts-too-eagerly' into 'master'
Fix space issue and add test
Closes #25879
See merge request !8217
Diffstat (limited to 'app/assets/javascripts/gfm_auto_complete.js.es6')
| -rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js.es6 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js.es6 b/app/assets/javascripts/gfm_auto_complete.js.es6 index 64e6258c154..cbd8ac4eddd 100644 --- a/app/assets/javascripts/gfm_auto_complete.js.es6 +++ b/app/assets/javascripts/gfm_auto_complete.js.es6 @@ -112,7 +112,6 @@ return value.path != null ? this.Emoji.template : this.Loading.template; }.bind(this), insertTpl: ':${name}:', - startWithSpace: false, skipSpecialCharacterTest: true, data: this.defaultLoadingData, callbacks: { @@ -129,7 +128,6 @@ }.bind(this), insertTpl: '${atwho-at}${username}', searchKey: 'search', - startWithSpace: false, alwaysHighlightFirst: true, skipSpecialCharacterTest: true, data: this.defaultLoadingData, @@ -172,7 +170,6 @@ }.bind(this), data: this.defaultLoadingData, insertTpl: '${atwho-at}${id}', - startWithSpace: false, callbacks: { sorter: this.DefaultOptions.sorter, filter: this.DefaultOptions.filter, @@ -200,7 +197,6 @@ displayTpl: function(value) { return value.title != null ? this.Milestones.template : this.Loading.template; }.bind(this), - startWithSpace: false, data: this.defaultLoadingData, callbacks: { matcher: this.DefaultOptions.matcher, @@ -225,7 +221,6 @@ at: '!', alias: 'mergerequests', searchKey: 'search', - startWithSpace: false, displayTpl: function(value) { return value.title != null ? this.Issues.template : this.Loading.template; }.bind(this), @@ -259,7 +254,6 @@ return this.isLoading(value) ? this.Loading.template : this.Labels.template; }.bind(this), insertTpl: '${atwho-at}${title}', - startWithSpace: false, callbacks: { matcher: this.DefaultOptions.matcher, sorter: this.DefaultOptions.sorter, |