summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-03-21 14:44:51 +0000
committerPhil Hughes <me@iamphill.com>2017-03-21 14:44:51 +0000
commitee8f09dafbcf7f3fc30a492f220d5d525cea283b (patch)
tree38ceb24f353255df8f676df3c3281acafd3e07b4 /app
parent8548aaa08d226478bdb07bea9c36d821694dcae8 (diff)
downloadgitlab-ce-ee8f09dafbcf7f3fc30a492f220d5d525cea283b.tar.gz
Fixed search param being used in the add issues modal
Also fixed the input placeholder in the modal not being displayed when first opened
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/boards/components/modal/filters.js2
-rw-r--r--app/assets/javascripts/boards/filtered_search_boards.js2
2 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/boards/components/modal/filters.js b/app/assets/javascripts/boards/components/modal/filters.js
index bd394a2318c..2e22b1eca47 100644
--- a/app/assets/javascripts/boards/components/modal/filters.js
+++ b/app/assets/javascripts/boards/components/modal/filters.js
@@ -14,6 +14,8 @@ export default {
this.filteredSearch = new FilteredSearchBoards(this.store);
this.filteredSearch.removeTokens();
+ this.filteredSearch.handleInputPlaceholder();
+ this.filteredSearch.toggleClearSearchButton();
},
beforeDestroy() {
this.filteredSearch.cleanup();
diff --git a/app/assets/javascripts/boards/filtered_search_boards.js b/app/assets/javascripts/boards/filtered_search_boards.js
index 101732309ea..1264280284c 100644
--- a/app/assets/javascripts/boards/filtered_search_boards.js
+++ b/app/assets/javascripts/boards/filtered_search_boards.js
@@ -28,6 +28,8 @@ export default class FilteredSearchBoards extends gl.FilteredSearchManager {
[].forEach.call(tokens, (el) => {
el.parentNode.removeChild(el);
});
+
+ this.filteredSearchInput.value = '';
}
updateTokens() {