diff options
author | Phil Hughes <me@iamphill.com> | 2018-04-05 10:46:19 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-04-05 16:33:50 +0100 |
commit | b61aa6f813a90aa104cb92dca687647171476337 (patch) | |
tree | fdac2ff7cc77b6af31b997d690aed0bad837382d /app/assets/javascripts/ide/components | |
parent | 748cd7676242b8950ad81577af92e80303d783d6 (diff) | |
download | gitlab-ce-b61aa6f813a90aa104cb92dca687647171476337.tar.gz |
fixed staged/unstaged files not opening when another 1 is open
fixes eslint
Diffstat (limited to 'app/assets/javascripts/ide/components')
-rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/list.vue | 7 | ||||
-rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/list_item.vue | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list.vue b/app/assets/javascripts/ide/components/commit_sidebar/list.vue index 77e69d2098f..c44eabb4d21 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list.vue @@ -50,11 +50,7 @@ export default { ...mapGetters(['collapseButtonIcon', 'collapseButtonTooltip']), }, methods: { - ...mapActions([ - 'toggleRightPanelCollapsed', - 'stageAllChanges', - 'unstageAllChanges', - ]), + ...mapActions(['toggleRightPanelCollapsed', 'stageAllChanges', 'unstageAllChanges']), actionBtnClicked() { this[this.action](); }, @@ -131,6 +127,7 @@ export default { <list-item :file="file" :action-component="itemActionComponent" + :key-prefix="title" /> </li> </ul> diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue index a79d0640913..56fa8ed0725 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue @@ -19,6 +19,11 @@ export default { type: String, required: true, }, + keyPrefix: { + type: String, + required: false, + default: '', + }, }, computed: { iconName() { @@ -39,7 +44,7 @@ export default { openFileInEditor() { return this.openPendingTab({ file: this.file, - keyPrefix: this.file.staged ? 'staged' : 'unstaged', + keyPrefix: this.keyPrefix.toLowerCase(), }).then(changeViewer => { if (changeViewer) { this.updateViewer('diff'); |