diff options
author | Phil Hughes <me@iamphill.com> | 2017-03-10 17:40:38 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-03-16 08:42:41 +0000 |
commit | 09f7b9dc3260d9fa65b5aeec4576b6159cfb93b2 (patch) | |
tree | 4d97d4714b2c1beb17d3e54c1628dd5fdf4f12d4 /app/assets/javascripts/boards | |
parent | a9deabea00a1fa34bfeb8b6c421a99aa7568a5c8 (diff) | |
download | gitlab-ce-09f7b9dc3260d9fa65b5aeec4576b6159cfb93b2.tar.gz |
Created a container class for filtered search
This class returns the correct container the filtered search should be
run in
At the moment it doesn't allow for multiple to be used at once, need to
look at a way to fix this
[ci skip]
Diffstat (limited to 'app/assets/javascripts/boards')
-rw-r--r-- | app/assets/javascripts/boards/components/modal/filters.js | 6 | ||||
-rw-r--r-- | app/assets/javascripts/boards/filtered_search_boards.js | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/boards/components/modal/filters.js b/app/assets/javascripts/boards/components/modal/filters.js index 991b3c695dd..907556345c6 100644 --- a/app/assets/javascripts/boards/components/modal/filters.js +++ b/app/assets/javascripts/boards/components/modal/filters.js @@ -1,12 +1,16 @@ /* global Vue */ import FilteredSearchBoards from '../../filtered_search_boards'; +import { FilteredSearchContainer } from '../../../filtered_search/container'; export default { name: 'modal-filters', mounted() { - this.filteredSearch = new FilteredSearchBoards({path: ''}, false, this.$el); + FilteredSearchContainer.container = this.$el; + + this.filteredSearch = new FilteredSearchBoards({path: ''}, false); }, destroyed() { + FilteredSearchContainer.container = document; gl.issueBoards.ModalStore.setDefaultFilter(); }, template: '#js-board-modal-filter', diff --git a/app/assets/javascripts/boards/filtered_search_boards.js b/app/assets/javascripts/boards/filtered_search_boards.js index de50bb67e86..47448b02bdd 100644 --- a/app/assets/javascripts/boards/filtered_search_boards.js +++ b/app/assets/javascripts/boards/filtered_search_boards.js @@ -1,6 +1,6 @@ export default class FilteredSearchBoards extends gl.FilteredSearchManager { - constructor(store, updateUrl = false, container = document) { - super('boards', container); + constructor(store, updateUrl = false) { + super('boards'); this.store = store; this.updateUrl = updateUrl; |