diff options
| author | Yann Gravrand <y.gravrand@gmail.com> | 2016-10-26 23:02:36 +0200 |
|---|---|---|
| committer | Alfredo Sumaran <a.sumaran@gmail.com> | 2016-12-27 18:58:35 -0500 |
| commit | f4f18f7bdc094bd78adbd34d2f5b6e2d18144fb5 (patch) | |
| tree | 7351e3293b4f3695c8f05cb17aa7209774380c9d | |
| parent | 04b20bc011e48ec6f0ab9291bea7154d65fea2a7 (diff) | |
| download | gitlab-ce-f4f18f7bdc094bd78adbd34d2f5b6e2d18144fb5.tar.gz | |
Fixes #22058 and #23578
| -rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js.es6 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js.es6 b/app/assets/javascripts/gfm_auto_complete.js.es6 index 3857bbb743b..ae5ee7d57ac 100644 --- a/app/assets/javascripts/gfm_auto_complete.js.es6 +++ b/app/assets/javascripts/gfm_auto_complete.js.es6 @@ -48,6 +48,7 @@ }, DefaultOptions: { sorter: function(query, items, searchKey) { + this.setting.highlightFirst = query.length > 0; if (gl.GfmAutoComplete.isLoading(items)) { return items; } @@ -204,6 +205,7 @@ sorter: this.DefaultOptions.sorter, beforeInsert: this.DefaultOptions.beforeInsert, filter: this.DefaultOptions.filter, + sorter: this.DefaultOptions.sorter, beforeSave: function(milestones) { return $.map(milestones, function(m) { if (m.title == null) { @@ -257,9 +259,9 @@ insertTpl: '${atwho-at}${title}', callbacks: { matcher: this.DefaultOptions.matcher, - sorter: this.DefaultOptions.sorter, beforeInsert: this.DefaultOptions.beforeInsert, filter: this.DefaultOptions.filter, + sorter: this.DefaultOptions.sorter, beforeSave: function(merges) { if (gl.GfmAutoComplete.isLoading(merges)) return merges; var sanitizeLabelTitle; |