summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-07-26 14:56:56 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-07-26 14:56:56 +0000
commitcded268ca1d49fe93b8e0940586e9792347c88c3 (patch)
tree9d84a5e8ae38e53514b6ab1f4e99d38ddf2fe138 /app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
parent8873840839811948b2f29175177b91bcf806a3f8 (diff)
downloadgitlab-ce-cded268ca1d49fe93b8e0940586e9792347c88c3.tar.gz
Enable deleting files in the Web IDE
Diffstat (limited to 'app/assets/javascripts/ide/components/commit_sidebar/list_item.vue')
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/list_item.vue10
1 files changed, 7 insertions, 3 deletions
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 ee21eeda3cd..391004dcd3c 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
@@ -5,6 +5,7 @@ import Icon from '~/vue_shared/components/icon.vue';
import StageButton from './stage_button.vue';
import UnstageButton from './unstage_button.vue';
import { viewerTypes } from '../../constants';
+import { getCommitIconMap } from '../../utils';
export default {
components: {
@@ -42,11 +43,12 @@ export default {
},
computed: {
iconName() {
- const prefix = this.stagedList ? '-solid' : '';
- return this.file.tempFile ? `file-addition${prefix}` : `file-modified${prefix}`;
+ const suffix = this.stagedList ? '-solid' : '';
+
+ return `${getCommitIconMap(this.file).icon}${suffix}`;
},
iconClass() {
- return `multi-file-${this.file.tempFile ? 'addition' : 'modified'} append-right-8`;
+ return `${getCommitIconMap(this.file).class} append-right-8`;
},
fullKey() {
return `${this.keyPrefix}-${this.file.key}`;
@@ -67,6 +69,8 @@ export default {
'stageChange',
]),
openFileInEditor() {
+ if (this.file.type === 'tree') return null;
+
return this.openPendingTab({
file: this.file,
keyPrefix: this.keyPrefix,