summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-03-07 14:43:17 +0000
committerPhil Hughes <me@iamphill.com>2017-03-08 08:48:59 +0000
commitab7bfff08b2ba8d15f1ab5f8fa4449dc53f51bab (patch)
treed4dd431fd2ed103bc38075f4bf8b64af36d4d155
parent107c39a66e621e35f808b3a257789d78bf153894 (diff)
downloadgitlab-ce-ab7bfff08b2ba8d15f1ab5f8fa4449dc53f51bab.tar.gz
Make changing the URL optional - future proof ourselves for the modal window
-rw-r--r--app/assets/javascripts/boards/boards_bundle.js7
-rw-r--r--app/assets/javascripts/boards/filtered_search_boards.js7
2 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/javascripts/boards/boards_bundle.js b/app/assets/javascripts/boards/boards_bundle.js
index 6b294290f77..1731f218f37 100644
--- a/app/assets/javascripts/boards/boards_bundle.js
+++ b/app/assets/javascripts/boards/boards_bundle.js
@@ -1,10 +1,11 @@
-/* eslint-disable one-var, quote-props, comma-dangle, space-before-function-paren */
+/* eslint-disable one-var, quote-props, comma-dangle, space-before-function-paren, no-new */
/* global Vue */
/* global BoardService */
+import FilteredSearchBoards from './filtered_search_boards';
+
window.Vue = require('vue');
window.Vue.use(require('vue-resource'));
-import FilteredSearchBoards from './filtered_search_boards';
require('./models/issue');
require('./models/label');
require('./models/list');
@@ -61,7 +62,7 @@ $(() => {
created () {
gl.boardService = new BoardService(this.endpoint, this.bulkUpdatePath, this.boardId);
- new FilteredSearchBoards(Store.filter);
+ new FilteredSearchBoards(Store.filter, true);
},
mounted () {
Store.disabled = this.disabled;
diff --git a/app/assets/javascripts/boards/filtered_search_boards.js b/app/assets/javascripts/boards/filtered_search_boards.js
index 43c6d9d7237..d00cb123909 100644
--- a/app/assets/javascripts/boards/filtered_search_boards.js
+++ b/app/assets/javascripts/boards/filtered_search_boards.js
@@ -1,14 +1,17 @@
export default class FilteredSearchBoards extends gl.FilteredSearchManager {
- constructor(store) {
+ constructor(store, updateUrl = false) {
super('boards');
this.store = store;
+ this.updateUrl = updateUrl;
this.isHandledAsync = true;
}
updateObject(path) {
this.store.path = path.substr(1);
- gl.issueBoards.BoardsStore.updateFiltersUrl();
+ if (this.updateUrl) {
+ gl.issueBoards.BoardsStore.updateFiltersUrl();
+ }
}
}