diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-23 22:05:18 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-23 22:05:18 +0300 |
| commit | e83e4dbde8a2d713b6803b376a69ffa3237e6716 (patch) | |
| tree | 266d48c763a81cb32a1bd84fccbf35ee5a3118e5 /app/assets/javascripts/boards | |
| parent | ed808a9f3477cdb77df3ca62fdddf2640f33653d (diff) | |
| parent | 536efa472a95d96e936fe5f328f2d686be532edb (diff) | |
Merge branch 'add-issues-modal-filtered-search-takes-search-param' into 'master'
Fixed search param being used in the add issues modal
See merge request !10114
Diffstat (limited to 'app/assets/javascripts/boards')
| -rw-r--r-- | app/assets/javascripts/boards/components/modal/filters.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/boards/filtered_search_boards.js | 2 |
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() { |