summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-06-03 17:23:04 +0200
committerWinnie Hellmann <winnie@gitlab.com>2019-06-03 17:23:04 +0200
commitc9630b4d0584ea41597b2ca9c562480f567c0dc1 (patch)
tree882c2045856aa25dc3d069dd1ef4977129f0094b
parent07630b3bdf7b386b820b2b7c82ba756c46a52be6 (diff)
downloadgitlab-ce-winh-issue-boards-clearIssueDetail.tar.gz
Rename clearDetailIssue() to clearIssueDetail()winh-issue-boards-clearIssueDetail
-rw-r--r--app/assets/javascripts/boards/components/board_card.vue2
-rw-r--r--app/assets/javascripts/boards/components/sidebar/remove_issue.vue2
-rw-r--r--app/assets/javascripts/boards/index.js8
-rw-r--r--app/assets/javascripts/boards/stores/boards_store.js2
-rw-r--r--spec/javascripts/boards/board_card_spec.js2
-rw-r--r--spec/javascripts/boards/boards_store_spec.js4
6 files changed, 10 insertions, 10 deletions
diff --git a/app/assets/javascripts/boards/components/board_card.vue b/app/assets/javascripts/boards/components/board_card.vue
index b8882203cc7..2d3da5bd0c9 100644
--- a/app/assets/javascripts/boards/components/board_card.vue
+++ b/app/assets/javascripts/boards/components/board_card.vue
@@ -63,7 +63,7 @@ export default {
this.showDetail = false;
if (boardsStore.detail.issue && boardsStore.detail.issue.id === this.issue.id) {
- eventHub.$emit('clearDetailIssue');
+ eventHub.$emit('clearIssueDetail');
} else {
eventHub.$emit('newDetailIssue', this.issue);
boardsStore.detail.list = this.list;
diff --git a/app/assets/javascripts/boards/components/sidebar/remove_issue.vue b/app/assets/javascripts/boards/components/sidebar/remove_issue.vue
index 4ab2b17301f..9cd84375f4e 100644
--- a/app/assets/javascripts/boards/components/sidebar/remove_issue.vue
+++ b/app/assets/javascripts/boards/components/sidebar/remove_issue.vue
@@ -48,7 +48,7 @@ export default Vue.extend({
list.removeIssue(issue);
});
- boardsStore.clearDetailIssue();
+ boardsStore.clearIssueDetail();
},
/**
* Build the default patch request.
diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js
index bc6a3cf212e..42611ec2a06 100644
--- a/app/assets/javascripts/boards/index.js
+++ b/app/assets/javascripts/boards/index.js
@@ -88,13 +88,13 @@ export default () => {
eventHub.$on('updateTokens', this.updateTokens);
eventHub.$on('newDetailIssue', this.updateDetailIssue);
- eventHub.$on('clearDetailIssue', this.clearDetailIssue);
+ eventHub.$on('clearIssueDetail', this.clearIssueDetail);
sidebarEventHub.$on('toggleSubscription', this.toggleSubscription);
},
beforeDestroy() {
eventHub.$off('updateTokens', this.updateTokens);
eventHub.$off('newDetailIssue', this.updateDetailIssue);
- eventHub.$off('clearDetailIssue', this.clearDetailIssue);
+ eventHub.$off('clearIssueDetail', this.clearIssueDetail);
sidebarEventHub.$off('toggleSubscription', this.toggleSubscription);
},
mounted() {
@@ -170,8 +170,8 @@ export default () => {
boardsStore.detail.issue = newIssue;
},
- clearDetailIssue() {
- boardsStore.clearDetailIssue();
+ clearIssueDetail() {
+ boardsStore.clearIssueDetail();
},
toggleSubscription(id) {
const { issue } = boardsStore.detail;
diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js
index 05efcbaa3cc..34aaab5e839 100644
--- a/app/assets/javascripts/boards/stores/boards_store.js
+++ b/app/assets/javascripts/boards/stores/boards_store.js
@@ -187,7 +187,7 @@ const boardsStore = {
window.history.pushState(null, null, `?${this.filter.path}`);
},
- clearDetailIssue() {
+ clearIssueDetail() {
this.detail.issue = {};
},
};
diff --git a/spec/javascripts/boards/board_card_spec.js b/spec/javascripts/boards/board_card_spec.js
index e1017130bed..3d299d0248a 100644
--- a/spec/javascripts/boards/board_card_spec.js
+++ b/spec/javascripts/boards/board_card_spec.js
@@ -203,7 +203,7 @@ describe('Board card', () => {
triggerEvent('mousedown');
triggerEvent('mouseup');
- expect(eventHub.$emit).toHaveBeenCalledWith('clearDetailIssue');
+ expect(eventHub.$emit).toHaveBeenCalledWith('clearIssueDetail');
});
});
});
diff --git a/spec/javascripts/boards/boards_store_spec.js b/spec/javascripts/boards/boards_store_spec.js
index d3e6eb78e5a..92cd8307acc 100644
--- a/spec/javascripts/boards/boards_store_spec.js
+++ b/spec/javascripts/boards/boards_store_spec.js
@@ -278,11 +278,11 @@ describe('Store', () => {
});
});
- describe('clearDetailIssue', () => {
+ describe('clearIssueDetail', () => {
it('resets issue details', () => {
boardsStore.detail.issue = 'something';
- boardsStore.clearDetailIssue();
+ boardsStore.clearIssueDetail();
expect(boardsStore.detail.issue).toEqual({});
});