summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-03-07 14:28:50 +0000
committerPhil Hughes <me@iamphill.com>2017-03-08 08:48:59 +0000
commit107c39a66e621e35f808b3a257789d78bf153894 (patch)
tree3a5c3ce4425a12b0f073d6bc7dc317124f759109
parentddf71fcef5d0d7b9952d77d712007008efbb5d3f (diff)
downloadgitlab-ce-107c39a66e621e35f808b3a257789d78bf153894.tar.gz
Stop droplab from destroying itself is handled async
-rw-r--r--app/assets/javascripts/boards/filtered_search_boards.js3
-rw-r--r--app/assets/javascripts/filtered_search/filtered_search_manager.js10
2 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/javascripts/boards/filtered_search_boards.js b/app/assets/javascripts/boards/filtered_search_boards.js
index ff8da88e6e8..43c6d9d7237 100644
--- a/app/assets/javascripts/boards/filtered_search_boards.js
+++ b/app/assets/javascripts/boards/filtered_search_boards.js
@@ -3,11 +3,12 @@ export default class FilteredSearchBoards extends gl.FilteredSearchManager {
super('boards');
this.store = store;
- this.destroyOnSubmit = false
+ this.isHandledAsync = true;
}
updateObject(path) {
this.store.path = path.substr(1);
+
gl.issueBoards.BoardsStore.updateFiltersUrl();
}
}
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js
index 56ff091197c..652d6c9be0e 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -105,8 +105,14 @@
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();
}