diff options
4 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue b/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue index c850e0ac84f..0c0a0faa59d 100644 --- a/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue +++ b/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue @@ -56,12 +56,12 @@ export default { return `${noteData.author.name}: ${note}`; }, toggleDiscussions() { - const shouldExpand = this.discussions.some(discussion => !discussion.expanded); + const forceExpanded = this.discussions.some(discussion => !discussion.expanded); this.discussions.forEach(discussion => { this.toggleDiscussion({ discussionId: discussion.id, - shouldExpand, + forceExpanded, }); }); }, diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js index b75b7525a75..bea396e5bb6 100644 --- a/app/assets/javascripts/notes/stores/mutations.js +++ b/app/assets/javascripts/notes/stores/mutations.js @@ -178,10 +178,10 @@ export default { } }, - [types.TOGGLE_DISCUSSION](state, { discussionId, shouldExpand = null }) { + [types.TOGGLE_DISCUSSION](state, { discussionId, forceExpanded = null }) { const discussion = utils.findNoteObjectById(state.discussions, discussionId); Object.assign(discussion, { - expanded: shouldExpand === null ? !discussion.expanded : shouldExpand, + expanded: forceExpanded === null ? !discussion.expanded : forceExpanded, }); }, diff --git a/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js b/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js index f0f97a9dd34..cdd30919b09 100644 --- a/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js +++ b/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js @@ -106,7 +106,7 @@ describe('DiffGutterAvatars', () => { 'toggleDiscussion', { discussionId: component.discussions[0].id, - shouldExpand: true, + forceExpanded: true, }, ]); @@ -114,7 +114,7 @@ describe('DiffGutterAvatars', () => { 'toggleDiscussion', { discussionId: component.discussions[1].id, - shouldExpand: true, + forceExpanded: true, }, ]); }); diff --git a/spec/javascripts/notes/stores/mutation_spec.js b/spec/javascripts/notes/stores/mutation_spec.js index bca87a53b1a..52cdc16353a 100644 --- a/spec/javascripts/notes/stores/mutation_spec.js +++ b/spec/javascripts/notes/stores/mutation_spec.js @@ -303,7 +303,7 @@ describe('Notes Store mutations', () => { discussions: [{ ...discussionMock, expanded: false }], }; - mutations.TOGGLE_DISCUSSION(state, { discussionId: discussionMock.id, shouldExpand: true }); + mutations.TOGGLE_DISCUSSION(state, { discussionId: discussionMock.id, forceExpanded: true }); expect(state.discussions[0].expanded).toEqual(true); }); |