diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-01 10:29:55 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-01 10:29:55 +0100 |
| commit | fe555e86fb54a0e21b49020b52a5e7f43beba73c (patch) | |
| tree | 8217a25e3a2aa1ff8ff1922f1c0e718d8d39e124 | |
| parent | 4bb9a36c97ac925c11c0211e3ef1f8ca1306da32 (diff) | |
| download | gitlab-ce-search-flickering.tar.gz | |
Fixes the search losing focussearch-flickering
This was caused by the blur & then the focus after transition end
Closes #35515
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/search-flickering.yml | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index 3babe273100..9475498e176 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -730,10 +730,10 @@ GitLabDropdown = (function() { GitLabDropdown.prototype.focusTextInput = function(triggerFocus = false) { if (this.options.filterable) { - $(':focus').blur(); - this.dropdown.one('transitionend', () => { - this.filterInput.focus(); + if (this.dropdown.is('.open')) { + this.filterInput.focus(); + } }); if (triggerFocus) { diff --git a/changelogs/unreleased/search-flickering.yml b/changelogs/unreleased/search-flickering.yml new file mode 100644 index 00000000000..951a5a0292a --- /dev/null +++ b/changelogs/unreleased/search-flickering.yml @@ -0,0 +1,4 @@ +--- +title: Fix search box losing focus when typing +merge_request: +author: |