diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-03 14:13:06 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-08-03 14:13:06 +0300 |
| commit | 2197ee02e95ade455785cc1769bf3a40a082a799 (patch) | |
| tree | 387a303a1bce6e5002c78a6d41c904ceffe2b357 /app/assets/javascripts/gl_dropdown.js | |
| parent | d0ffbd18fa5be4e90d150bc617d0cc7eb3c8720b (diff) | |
| parent | 1018ab0516fd94d1ffbc05a0ad8499947dd9630d (diff) | |
Merge branch 'master' into ide
Diffstat (limited to 'app/assets/javascripts/gl_dropdown.js')
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index 1381ca35aef..915b06e73ee 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -781,10 +781,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) { |