diff options
author | Phil Hughes <me@iamphill.com> | 2017-01-25 16:53:09 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-02-03 17:02:43 +0300 |
commit | 6adb6caed9c6a25aa68ee9ceb37419543bb49e23 (patch) | |
tree | 10ca2936b6adebb3f09beaa3a8f921f4e53a08b3 /app/assets/javascripts/boards/components/modal | |
parent | 240d8c8d307e4675e72d854f4d70d722075c02c4 (diff) | |
download | gitlab-ce-6adb6caed9c6a25aa68ee9ceb37419543bb49e23.tar.gz |
Started tests
Diffstat (limited to 'app/assets/javascripts/boards/components/modal')
-rw-r--r-- | app/assets/javascripts/boards/components/modal/dismiss.js.es6 | 2 | ||||
-rw-r--r-- | app/assets/javascripts/boards/components/modal/footer.js.es6 | 2 | ||||
-rw-r--r-- | app/assets/javascripts/boards/components/modal/header.js.es6 | 6 | ||||
-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.es6 | 2 | ||||
-rw-r--r-- | app/assets/javascripts/boards/components/modal/lists_dropdown.js.es6 | 3 | ||||
-rw-r--r-- | app/assets/javascripts/boards/components/modal/search.js.es6 | 2 | ||||
-rw-r--r-- | app/assets/javascripts/boards/components/modal/tabs.js.es6 | 2 |
8 files changed, 12 insertions, 11 deletions
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) { |