diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-03 08:46:36 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-03 08:46:36 +0000 |
| commit | ac03f30cd938cd2c75d05cbc7adbde3f42666ab1 (patch) | |
| tree | 266a045cd57b5203ec024f5372bbc3da6ee34ba5 /app | |
| parent | 955e06b48b19d79856f16e8e9825d14d57634ade (diff) | |
| parent | 9181e4b135053140fe61f785603eb8101f4534f1 (diff) | |
| download | gitlab-ce-ac03f30cd938cd2c75d05cbc7adbde3f42666ab1.tar.gz | |
Merge branch 'fix-search-dropdown-blur-close' into 'master'
Fix search dropdown not closing on blur if empty
Closes #53741
See merge request gitlab-org/gitlab-ce!28730
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/search_autocomplete.js | 2 | ||||
| -rw-r--r-- | app/views/layouts/_search.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js index ab43c2139bf..a0780f36b7b 100644 --- a/app/assets/javascripts/search_autocomplete.js +++ b/app/assets/javascripts/search_autocomplete.js @@ -405,7 +405,7 @@ export class SearchAutocomplete { this.wrap.removeClass('search-active'); // If input is blank then restore state if (this.searchInput.val() === '') { - return this.restoreOriginalState(); + this.restoreOriginalState(); } this.dropdownMenu.removeClass('show'); } diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index a6023a1cbb9..496ec3c78b0 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -16,7 +16,7 @@ mr_path: merge_requests_dashboard_path }, aria: { label: _('Search or jump to…') } %button.hidden.js-dropdown-search-toggle{ type: 'button', data: { toggle: 'dropdown' } } - .dropdown-menu.dropdown-select + .dropdown-menu.dropdown-select.js-dashboard-search-options = dropdown_content do %ul %li.dropdown-menu-empty-item |