diff options
| -rw-r--r-- | app/assets/javascripts/ide/components/repo_file.vue | 10 | ||||
| -rw-r--r-- | app/assets/javascripts/ide/stores/actions/file.js | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue index 63ca8c3ab89..89c5ce70dd3 100644 --- a/app/assets/javascripts/ide/components/repo_file.vue +++ b/app/assets/javascripts/ide/components/repo_file.vue @@ -83,6 +83,12 @@ export default { 'is-open': this.file.opened, }; }, + showTreeChangesCount() { + return this.isTree && this.changesCount > 0 && !this.file.opened; + }, + showChangedFileIcon() { + return this.file.changed || this.file.tempFile || this.file.staged; + }, }, updated() { if (this.file.type === 'blob' && this.file.active) { @@ -140,7 +146,7 @@ export default { v-if="file.mrChange" /> <span - v-if="isTree && changesCount > 0 && !file.opened" + v-if="showTreeChangesCount" class="ide-tree-changes" > {{ changesCount }} @@ -155,7 +161,7 @@ export default { /> </span> <changed-file-icon - v-else-if="file.changed || file.tempFile || file.staged" + v-else-if="showChangedFileIcon" :file="file" :show-tooltip="true" :show-staged-icon="true" diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index 6cee19b83b8..fcdb3b753b2 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -117,7 +117,7 @@ export const getRawFileData = ({ state, commit, dispatch }, { path, baseSha }) = }); }; -export const changeFileContent = ({ state, commit, dispatch, getters }, { path, content }) => { +export const changeFileContent = ({ state, commit }, { path, content }) => { const file = state.entries[path]; commit(types.UPDATE_FILE_CONTENT, { path, content }); |