diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-14 20:08:33 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-14 20:08:33 +0300 |
commit | 0046ffc0248f5edda84f8da0c7aeff97733eae2f (patch) | |
tree | 66c1e4a4d0775d7f05a5b2effb199d1767807788 /app/assets/javascripts/filtered_search | |
parent | e52529e25c8f4b597bbf4ae2815f570b4e4a9898 (diff) | |
parent | c7cecae616702a46430ed41e283912ddc22f2612 (diff) |
Merge branch 'issue-boards-new-search-bar' into 'master'
Added filtered search bar to issue boards
Closes #28312
See merge request !9757
Diffstat (limited to 'app/assets/javascripts/filtered_search')
-rw-r--r-- | app/assets/javascripts/filtered_search/filtered_search_manager.js | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js index 835e87a28d7..f885932bd91 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js @@ -106,8 +106,15 @@ e.preventDefault(); if (!activeElements.length) { - // Prevent droplab from opening dropdown - this.dropdownManager.destroyDroplab(); + if (this.isHandledAsync) { + e.stopImmediatePropagation(); + + this.filteredSearchInput.blur(); + this.dropdownManager.resetDropdowns(); + } else { + // Prevent droplab from opening dropdown + this.dropdownManager.destroyDroplab(); + } this.search(); } @@ -200,6 +207,10 @@ this.handleInputPlaceholder(); this.dropdownManager.resetDropdowns(); + + if (this.isHandledAsync) { + this.search(); + } } handleInputVisualToken() { @@ -346,7 +357,11 @@ const parameterizedUrl = `?scope=all&utf8=✓&${paths.join('&')}`; - gl.utils.visitUrl(parameterizedUrl); + if (this.updateObject) { + this.updateObject(parameterizedUrl); + } else { + gl.utils.visitUrl(parameterizedUrl); + } } getUsernameParams() { |