diff options
author | Phil Hughes <me@iamphill.com> | 2016-08-15 09:57:01 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-08-17 17:17:39 +0100 |
commit | aa05b5ed8b69e90d1e9f38c13db3af2af85e8285 (patch) | |
tree | b055085c63e3e180a549cacc7e9010f4dd8ed75b /app/assets/javascripts | |
parent | abb55af272beafd71fd69400be3dbd1a16d81654 (diff) | |
download | gitlab-ce-aa05b5ed8b69e90d1e9f38c13db3af2af85e8285.tar.gz |
Moved board store to namespaced gl object
Diffstat (limited to 'app/assets/javascripts')
12 files changed, 43 insertions, 42 deletions
diff --git a/app/assets/javascripts/boards/boards_bundle.js.es6 b/app/assets/javascripts/boards/boards_bundle.js.es6 index e965255f6da..6a83785aa50 100644 --- a/app/assets/javascripts/boards/boards_bundle.js.es6 +++ b/app/assets/javascripts/boards/boards_bundle.js.es6 @@ -10,9 +10,7 @@ $(() => { const $boardApp = $('#board-app'); - if (!window.gl) { - window.gl = {}; - } + window.gl = window.gl || {}; if (gl.IssueBoardsApp) { gl.IssueBoardsApp.$destroy(true); @@ -21,14 +19,14 @@ $(() => { gl.IssueBoardsApp = new Vue({ el: $boardApp.get(0), data: { - state: BoardsStore.state, + state: gl.issueBoards.BoardsStore.state, loading: true, endpoint: $boardApp.data('endpoint'), disabled: $boardApp.data('disabled'), issueLinkBase: $boardApp.data('issue-link-base') }, init () { - BoardsStore.create(); + gl.issueBoards.BoardsStore.create(); }, created () { this.loading = true; @@ -40,14 +38,14 @@ $(() => { .removeAttr('data-issue-link-base'); }, ready () { - BoardsStore.disabled = this.disabled; + gl.issueBoards.BoardsStore.disabled = this.disabled; gl.boardService.all() .then((resp) => { const boards = resp.json(); for (let i = 0, boardsLength = boards.length; i < boardsLength; i++) { const board = boards[i], - list = BoardsStore.addList(board); + list = gl.issueBoards.BoardsStore.addList(board); if (list.type === 'done') { list.position = Infinity; @@ -56,7 +54,7 @@ $(() => { } } - BoardsStore.addBlankState(); + gl.issueBoards.BoardsStore.addBlankState(); this.loading = false; }); } diff --git a/app/assets/javascripts/boards/components/board.js.es6 b/app/assets/javascripts/boards/components/board.js.es6 index 79727b96874..6f9f054f346 100644 --- a/app/assets/javascripts/boards/components/board.js.es6 +++ b/app/assets/javascripts/boards/components/board.js.es6 @@ -8,7 +8,7 @@ data () { return { query: '', - filters: BoardsStore.state.filters + filters: gl.issueBoards.BoardsStore.state.filters }; }, watch: { @@ -53,7 +53,7 @@ draggable: '.is-draggable', handle: '.js-board-handle', onUpdate (e) { - BoardsStore.moveList(e.oldIndex, e.newIndex); + gl.issueBoards.BoardsStore.moveList(e.oldIndex, e.newIndex); } }); diff --git a/app/assets/javascripts/boards/components/board_blank_state.js.es6 b/app/assets/javascripts/boards/components/board_blank_state.js.es6 index 0f8e4b1b1f7..5a189f5b4a9 100644 --- a/app/assets/javascripts/boards/components/board_blank_state.js.es6 +++ b/app/assets/javascripts/boards/components/board_blank_state.js.es6 @@ -12,12 +12,12 @@ }, methods: { addDefaultLists () { - BoardsStore.removeBlankState(); + gl.issueBoards.BoardsStore.removeBlankState(); for (let i = 0, labelsLength = this.predefinedLabels.length; i < labelsLength; i++) { const label = this.predefinedLabels[i]; - BoardsStore.addList({ + gl.issueBoards.BoardsStore.addList({ title: label.title, position: i, list_type: 'label', @@ -36,7 +36,7 @@ for (let i = 0, dataLength = data.length; i < dataLength; i++) { const listObj = data[i], - list = BoardsStore.findList('title', listObj.title); + list = gl.issueBoards.BoardsStore.findList('title', listObj.title); list.id = listObj.id; list.label.id = listObj.label.id; @@ -45,7 +45,7 @@ }); }, clearBlankState () { - BoardsStore.removeBlankState(); + gl.issueBoards.BoardsStore.removeBlankState(); } } }); diff --git a/app/assets/javascripts/boards/components/board_card.js.es6 b/app/assets/javascripts/boards/components/board_card.js.es6 index 411415e46a4..481116d21d2 100644 --- a/app/assets/javascripts/boards/components/board_card.js.es6 +++ b/app/assets/javascripts/boards/components/board_card.js.es6 @@ -9,19 +9,19 @@ methods: { filterByLabel (label, e) { let labelToggleText = label.title; - const labelIndex = BoardsStore.state.filters['label_name'].indexOf(label.title); + const labelIndex = gl.issueBoards.BoardsStore.state.filters['label_name'].indexOf(label.title); $(e.target).tooltip('hide'); if (labelIndex === -1) { - BoardsStore.state.filters['label_name'].push(label.title); + gl.issueBoards.BoardsStore.state.filters['label_name'].push(label.title); $('.labels-filter').prepend(`<input type="hidden" name="label_name[]" value="${label.title}" />`); } else { - BoardsStore.state.filters['label_name'].splice(labelIndex, 1); - labelToggleText = BoardsStore.state.filters['label_name'][0]; + gl.issueBoards.BoardsStore.state.filters['label_name'].splice(labelIndex, 1); + labelToggleText = gl.issueBoards.BoardsStore.state.filters['label_name'][0]; $(`.labels-filter input[name="label_name[]"][value="${label.title}"]`).remove(); } - const selectedLabels = BoardsStore.state.filters['label_name']; + const selectedLabels = gl.issueBoards.BoardsStore.state.filters['label_name']; if (selectedLabels.length === 0) { labelToggleText = 'Label'; } else if (selectedLabels.length > 1) { @@ -30,7 +30,7 @@ $('.labels-filter .dropdown-toggle-text').text(labelToggleText); - BoardsStore.updateFiltersUrl(); + gl.issueBoards.BoardsStore.updateFiltersUrl(); } } }); diff --git a/app/assets/javascripts/boards/components/board_list.js.es6 b/app/assets/javascripts/boards/components/board_list.js.es6 index df5fc51339a..f6675107afe 100644 --- a/app/assets/javascripts/boards/components/board_list.js.es6 +++ b/app/assets/javascripts/boards/components/board_list.js.es6 @@ -10,7 +10,7 @@ data () { return { scrollOffset: 250, - filters: BoardsStore.state.filters + filters: gl.issueBoards.BoardsStore.state.filters }; }, watch: { @@ -57,7 +57,7 @@ // Remove the new dom element & let vue add the element card.parentNode.removeChild(card); - BoardsStore.moveCardToList(fromListId, toListId, issueId); + gl.issueBoards.BoardsStore.moveCardToList(fromListId, toListId, issueId); } }); diff --git a/app/assets/javascripts/boards/components/new_list_dropdown.js.es6 b/app/assets/javascripts/boards/components/new_list_dropdown.js.es6 index e02591e4bf6..4d69f8cdabc 100644 --- a/app/assets/javascripts/boards/components/new_list_dropdown.js.es6 +++ b/app/assets/javascripts/boards/components/new_list_dropdown.js.es6 @@ -13,7 +13,7 @@ $(() => { }); }, renderRow (label) { - const active = BoardsStore.findList('title', label.title), + const active = gl.issueBoards.BoardsStore.findList('title', label.title), $li = $('<li />',), $a = $('<a />', { class: (active ? `is-active js-board-list-${active.id}` : ''), @@ -35,10 +35,10 @@ $(() => { clicked (label, $el, e) { e.preventDefault(); - if (!BoardsStore.findList('title', label.title)) { - BoardsStore.new({ + if (!gl.issueBoards.BoardsStore.findList('title', label.title)) { + gl.issueBoards.BoardsStore.new({ title: label.title, - position: BoardsStore.state.lists.length - 1, + position: gl.issueBoards.BoardsStore.state.lists.length - 1, list_type: 'label', label: { id: label.id, diff --git a/app/assets/javascripts/boards/models/issue.js.es6 b/app/assets/javascripts/boards/models/issue.js.es6 index c2aff84a4d9..9d918b1d79a 100644 --- a/app/assets/javascripts/boards/models/issue.js.es6 +++ b/app/assets/javascripts/boards/models/issue.js.es6 @@ -52,7 +52,7 @@ class ListIssue { } getLists () { - return BoardsStore.state.lists.filter((list) => { + return gl.issueBoards.BoardsStore.state.lists.filter((list) => { return list.findIssue(this.id); }); } diff --git a/app/assets/javascripts/boards/models/list.js.es6 b/app/assets/javascripts/boards/models/list.js.es6 index 928663971e6..1183c23f2d7 100644 --- a/app/assets/javascripts/boards/models/list.js.es6 +++ b/app/assets/javascripts/boards/models/list.js.es6 @@ -4,7 +4,7 @@ class List { this.position = obj.position; this.title = obj.title; this.type = obj.list_type; - this.filters = BoardsStore.state.filters; + this.filters = gl.issueBoards.BoardsStore.state.filters; this.page = 1; this.loading = true; this.loadingMore = false; @@ -34,10 +34,10 @@ class List { destroy () { if (this.type !== 'blank') { - BoardsStore.state.lists = BoardsStore.state.lists.filter((list) => { + gl.issueBoards.BoardsStore.state.lists = gl.issueBoards.BoardsStore.state.lists.filter((list) => { return list.id !== this.id; }); - BoardsStore.updateNewListDropdown(this.id); + gl.issueBoards.BoardsStore.updateNewListDropdown(this.id); gl.boardService.destroyList(this.id); } diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6 index cddedb35509..675e37d1375 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js.es6 +++ b/app/assets/javascripts/boards/stores/boards_store.js.es6 @@ -1,5 +1,8 @@ -((w) => { - w.BoardsStore = { +(() => { + window.gl = window.gl || {}; + window.gl.issueBoards = window.gl.issueBoards || {}; + + gl.issueBoards.BoardsStore = { disabled: false, state: {}, create () { @@ -126,4 +129,4 @@ history.pushState(null, null, `?${$.param(this.state.filters)}`); } }; -}(window)); +})(); diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index 31762d72bc0..0526430989f 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -246,18 +246,18 @@ isMRIndex = page === 'projects:merge_requests:index'; if (page === 'projects:boards:show') { if (label.isAny) { - BoardsStore.state.filters['label_name'] = []; + gl.issueBoards.BoardsStore.state.filters['label_name'] = []; } else if (label.title) { - BoardsStore.state.filters['label_name'].push(label.title); + gl.issueBoards.BoardsStore.state.filters['label_name'].push(label.title); } else { - var filters = BoardsStore.state.filters['label_name']; + var filters = gl.issueBoards.BoardsStore.state.filters['label_name']; filters = filters.filter(function (label) { return label !== $el.text().trim(); }); - BoardsStore.state.filters['label_name'] = filters; + gl.issueBoards.BoardsStore.state.filters['label_name'] = filters; } - BoardsStore.updateFiltersUrl(); + gl.issueBoards.BoardsStore.updateFiltersUrl(); e.preventDefault(); return; } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) { diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index 9093098359e..e897ebdf630 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -103,8 +103,8 @@ return; } if (page === 'projects:boards:show') { - BoardsStore.state.filters[$dropdown.data('field-name')] = selected.name; - BoardsStore.updateFiltersUrl(); + gl.issueBoards.BoardsStore.state.filters[$dropdown.data('field-name')] = selected.name; + gl.issueBoards.BoardsStore.updateFiltersUrl(); e.preventDefault(); } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) { if (selected.name != null) { diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index aa157749443..bad82868ab0 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -151,8 +151,8 @@ } if (page === 'projects:boards:show') { selectedId = user.id; - BoardsStore.state.filters[$dropdown.data('field-name')] = user.id; - BoardsStore.updateFiltersUrl(); + gl.issueBoards.BoardsStore.state.filters[$dropdown.data('field-name')] = user.id; + gl.issueBoards.BoardsStore.updateFiltersUrl(); e.preventDefault(); } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) { selectedId = user.id; |