diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-06-27 10:00:11 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-06-27 10:00:11 +0300 |
commit | c03701b9f75562a0318880b4863f6ab099893a3e (patch) | |
tree | 8e7675186a44b8a63e7a1012efce32cf65a48681 | |
parent | 292cf668905a55e7b305c67b314cb039d2681a54 (diff) | |
parent | 31d9c1a6839eaf74bace8c22631c02c014bb17a0 (diff) |
Merge branch '48461-search-dropdown-hides-shows-when-typing' into 'master'
Resolve "Search dropdown hides & shows when typing"
Closes #48461
See merge request gitlab-org/gitlab-ce!20187
-rw-r--r-- | app/assets/javascripts/search_autocomplete.js | 6 | ||||
-rw-r--r-- | changelogs/unreleased/48461-search-dropdown-hides-shows-when-typing.yml | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js index 2f4e4881f24..5b2e0468784 100644 --- a/app/assets/javascripts/search_autocomplete.js +++ b/app/assets/javascripts/search_autocomplete.js @@ -289,7 +289,7 @@ export default class SearchAutocomplete { } // If the dropdown is closed, we'll open it - if (!this.dropdown.hasClass('open')) { + if (!this.dropdown.hasClass('show')) { this.loadingSuggestions = false; this.dropdownToggle.dropdown('toggle'); return this.searchInput.removeClass('disabled'); @@ -424,9 +424,9 @@ export default class SearchAutocomplete { } disableAutocomplete() { - if (!this.searchInput.hasClass('disabled') && this.dropdown.hasClass('open')) { + if (!this.searchInput.hasClass('disabled') && this.dropdown.hasClass('show')) { this.searchInput.addClass('disabled'); - this.dropdown.removeClass('open').trigger('hidden.bs.dropdown'); + this.dropdown.removeClass('show').trigger('hidden.bs.dropdown'); this.restoreMenu(); } } diff --git a/changelogs/unreleased/48461-search-dropdown-hides-shows-when-typing.yml b/changelogs/unreleased/48461-search-dropdown-hides-shows-when-typing.yml new file mode 100644 index 00000000000..2ebc22dbf8f --- /dev/null +++ b/changelogs/unreleased/48461-search-dropdown-hides-shows-when-typing.yml @@ -0,0 +1,5 @@ +--- +title: Fix loading screen for search autocomplete dropdown +merge_request: +author: +type: fixed |