summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/boards/boards_bundle.js.es69
-rw-r--r--app/assets/javascripts/boards/components/modal/dismiss.js.es62
-rw-r--r--app/assets/javascripts/boards/components/modal/footer.js.es62
-rw-r--r--app/assets/javascripts/boards/components/modal/header.js.es66
-rw-r--r--app/assets/javascripts/boards/components/modal/index.js.es6 (renamed from app/assets/javascripts/boards/components/modal/modal.es6)4
-rw-r--r--app/assets/javascripts/boards/components/modal/list.js.es62
-rw-r--r--app/assets/javascripts/boards/components/modal/lists_dropdown.js.es63
-rw-r--r--app/assets/javascripts/boards/components/modal/search.js.es62
-rw-r--r--app/assets/javascripts/boards/components/modal/tabs.js.es62
-rw-r--r--app/assets/javascripts/boards/stores/boards_store.js.es69
-rw-r--r--app/assets/javascripts/boards/stores/modal_store.js.es624
11 files changed, 32 insertions, 33 deletions
diff --git a/app/assets/javascripts/boards/boards_bundle.js.es6 b/app/assets/javascripts/boards/boards_bundle.js.es6
index 67d9f023866..e2b3d2c7df6 100644
--- a/app/assets/javascripts/boards/boards_bundle.js.es6
+++ b/app/assets/javascripts/boards/boards_bundle.js.es6
@@ -14,12 +14,13 @@
//= require ./components/board
//= require ./components/board_sidebar
//= require ./components/new_list_dropdown
-//= require ./components/modal/modal
+//= require ./components/modal/index
//= require ./vue_resource_interceptor
$(() => {
const $boardApp = document.getElementById('board-app');
const Store = gl.issueBoards.BoardsStore;
+ const ModalStore = gl.issueBoards.ModalStore;
window.gl = window.gl || {};
@@ -73,10 +74,8 @@ $(() => {
this.loading = false;
if (this.state.lists.length > 0) {
- Store.modal.selectedList = this.state.lists[0];
+ ModalStore.store.selectedList = this.state.lists[0];
}
-
- Store.modal.showAddIssuesModal = true;
});
}
});
@@ -97,6 +96,6 @@ $(() => {
.on('click', '.js-show-add-issues', (e) => {
e.preventDefault();
- Store.modal.showAddIssuesModal = true;
+ ModalStore.store.showAddIssuesModal = true;
});
});
diff --git a/app/assets/javascripts/boards/components/modal/dismiss.js.es6 b/app/assets/javascripts/boards/components/modal/dismiss.js.es6
index 0483b4b412d..cf952837d39 100644
--- a/app/assets/javascripts/boards/components/modal/dismiss.js.es6
+++ b/app/assets/javascripts/boards/components/modal/dismiss.js.es6
@@ -7,7 +7,7 @@
gl.issueBoards.DismissModal = Vue.extend({
data() {
- return ModalStore.globalStore;
+ return ModalStore.store;
},
methods: {
toggleModal(toggle) {
diff --git a/app/assets/javascripts/boards/components/modal/footer.js.es6 b/app/assets/javascripts/boards/components/modal/footer.js.es6
index 66414d96100..e4d49b914bd 100644
--- a/app/assets/javascripts/boards/components/modal/footer.js.es6
+++ b/app/assets/javascripts/boards/components/modal/footer.js.es6
@@ -8,7 +8,7 @@
gl.issueBoards.ModalFooter = Vue.extend({
data() {
- return ModalStore.globalStore;
+ return ModalStore.store;
},
computed: {
submitDisabled() {
diff --git a/app/assets/javascripts/boards/components/modal/header.js.es6 b/app/assets/javascripts/boards/components/modal/header.js.es6
index cab08076b15..6896a0fcf45 100644
--- a/app/assets/javascripts/boards/components/modal/header.js.es6
+++ b/app/assets/javascripts/boards/components/modal/header.js.es6
@@ -1,7 +1,7 @@
-//= require ./dismiss
+/* global Vue */
//= require ./tabs
+//= require ./dismiss
//= require ./search
-/* global Vue */
(() => {
const ModalStore = gl.issueBoards.ModalStore;
@@ -10,7 +10,7 @@
gl.issueBoards.IssuesModalHeader = Vue.extend({
data() {
- return ModalStore.globalStore;
+ return ModalStore.store;
},
components: {
'modal-dismiss': gl.issueBoards.DismissModal,
diff --git a/app/assets/javascripts/boards/components/modal/modal.es6 b/app/assets/javascripts/boards/components/modal/index.js.es6
index 501f493a1d8..693182fe37e 100644
--- a/app/assets/javascripts/boards/components/modal/modal.es6
+++ b/app/assets/javascripts/boards/components/modal/index.js.es6
@@ -1,7 +1,7 @@
+/* global Vue */
//= require ./header
//= require ./list
//= require ./footer
-/* global Vue */
(() => {
const ModalStore = gl.issueBoards.ModalStore;
@@ -10,7 +10,7 @@
gl.issueBoards.IssuesModal = Vue.extend({
data() {
- return ModalStore.globalStore;
+ return ModalStore.store;
},
watch: {
searchTerm() {
diff --git a/app/assets/javascripts/boards/components/modal/list.js.es6 b/app/assets/javascripts/boards/components/modal/list.js.es6
index 0a9da849ef9..55e3ff3c7f4 100644
--- a/app/assets/javascripts/boards/components/modal/list.js.es6
+++ b/app/assets/javascripts/boards/components/modal/list.js.es6
@@ -10,7 +10,7 @@
gl.issueBoards.ModalList = Vue.extend({
data() {
- return ModalStore.globalStore;
+ return ModalStore.store;
},
watch: {
activeTab() {
diff --git a/app/assets/javascripts/boards/components/modal/lists_dropdown.js.es6 b/app/assets/javascripts/boards/components/modal/lists_dropdown.js.es6
index a147bd0d2aa..e68ad30500c 100644
--- a/app/assets/javascripts/boards/components/modal/lists_dropdown.js.es6
+++ b/app/assets/javascripts/boards/components/modal/lists_dropdown.js.es6
@@ -1,5 +1,6 @@
/* global Vue */
(() => {
+ const ModalStore = gl.issueBoards.ModalStore;
const Store = gl.issueBoards.BoardsStore;
window.gl = window.gl || {};
@@ -8,7 +9,7 @@
gl.issueBoards.ModalFooterListsDropdown = Vue.extend({
data() {
return {
- modal: Store.modal,
+ modal: ModalStore.store,
state: Store.state,
};
},
diff --git a/app/assets/javascripts/boards/components/modal/search.js.es6 b/app/assets/javascripts/boards/components/modal/search.js.es6
index 6753656ec4a..764340bc5f3 100644
--- a/app/assets/javascripts/boards/components/modal/search.js.es6
+++ b/app/assets/javascripts/boards/components/modal/search.js.es6
@@ -7,7 +7,7 @@
gl.issueBoards.ModalSearch = Vue.extend({
data() {
- return ModalStore.globalStore;
+ return ModalStore.store;
},
computed: {
selectAllText() {
diff --git a/app/assets/javascripts/boards/components/modal/tabs.js.es6 b/app/assets/javascripts/boards/components/modal/tabs.js.es6
index 2730893df76..f9026cea90b 100644
--- a/app/assets/javascripts/boards/components/modal/tabs.js.es6
+++ b/app/assets/javascripts/boards/components/modal/tabs.js.es6
@@ -7,7 +7,7 @@
gl.issueBoards.ModalTabs = Vue.extend({
data() {
- return ModalStore.globalStore;
+ return ModalStore.store;
},
methods: {
changeTab(tab) {
diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6
index d29731ad0aa..66ecae1c01d 100644
--- a/app/assets/javascripts/boards/stores/boards_store.js.es6
+++ b/app/assets/javascripts/boards/stores/boards_store.js.es6
@@ -12,15 +12,6 @@
detail: {
issue: {}
},
- modal: {
- issues: [],
- selectedIssues: [],
- showAddIssuesModal: false,
- activeTab: 'all',
- selectedList: {},
- searchTerm: '',
- loading: false,
- },
moving: {
issue: {},
list: {}
diff --git a/app/assets/javascripts/boards/stores/modal_store.js.es6 b/app/assets/javascripts/boards/stores/modal_store.js.es6
index 68f5e57a154..54419751433 100644
--- a/app/assets/javascripts/boards/stores/modal_store.js.es6
+++ b/app/assets/javascripts/boards/stores/modal_store.js.es6
@@ -4,11 +4,19 @@
class ModalStore {
constructor() {
- this.globalStore = gl.issueBoards.BoardsStore.modal;
+ this.store = {
+ issues: [],
+ selectedIssues: [],
+ showAddIssuesModal: false,
+ activeTab: 'all',
+ selectedList: {},
+ searchTerm: '',
+ loading: false,
+ };
}
selectedCount() {
- return this.globalStore.selectedIssues.length;
+ return this.store.selectedIssues.length;
}
toggleIssue(issueObj) {
@@ -23,9 +31,9 @@
}
toggleAll() {
- const select = this.selectedCount() !== this.globalStore.issues.length;
+ const select = this.selectedCount() !== this.store.issues.length;
- this.globalStore.issues.forEach((issue) => {
+ this.store.issues.forEach((issue) => {
const issueUpdate = issue;
if (issueUpdate.selected !== select) {
@@ -41,20 +49,20 @@
}
addSelectedIssue(issue) {
- this.globalStore.selectedIssues.push(issue);
+ this.store.selectedIssues.push(issue);
}
removeSelectedIssue(issue) {
const index = this.selectedIssueIndex(issue);
- this.globalStore.selectedIssues.splice(index, 1);
+ this.store.selectedIssues.splice(index, 1);
}
selectedIssueIndex(issue) {
- return this.globalStore.selectedIssues.indexOf(issue);
+ return this.store.selectedIssues.indexOf(issue);
}
findSelectedIssue(issue) {
- return this.globalStore.selectedIssues
+ return this.store.selectedIssues
.filter(filteredIssue => filteredIssue.id === issue.id)[0];
}
}
View Lorry Controller Status