diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-14 10:23:07 +0200 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-14 10:23:07 +0200 |
commit | baa1d40c846cafe25601219e68699e77ffd8093d (patch) | |
tree | 433bea253d0c46c0f43c835c033a451a5265d8c9 /app/assets/javascripts | |
parent | b6a2e6553b8c0f15b79677fcc83a3e17856e65b1 (diff) | |
download | gitlab-ce-baa1d40c846cafe25601219e68699e77ffd8093d.tar.gz |
Added compute property to diff file + changed a for loop
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_file.vue | 5 | ||||
-rw-r--r-- | app/assets/javascripts/diffs/store/mutations.js | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index e887a71c551..59e9ba08b8b 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -46,6 +46,9 @@ export default { showExpandMessage() { return this.isCollapsed && !this.isLoadingCollapsedDiff && !this.file.tooLarge; }, + showLoadingIcon() { + return this.isLoadingCollapsedDiff || (!this.file.renderIt && !this.isCollapsed); + }, }, methods: { ...mapActions('diffs', ['loadCollapsedDiff']), @@ -133,7 +136,7 @@ export default { :diff-file="file" /> <loading-icon - v-if="isLoadingCollapsedDiff || (!file.renderIt && !isCollapsed)" + v-else-if="showLoadingIcon" class="diff-content loading" /> <div diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index 0b538cd7982..0522e32c410 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -34,7 +34,7 @@ export default { if (file.highlightedDiffLines) { const linesLength = file.highlightedDiffLines.length; - let u = 0; + let u; for (u = 0; u < linesLength; u += 1) { const line = file.highlightedDiffLines[u]; delete line.text; |