diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-09-07 16:20:57 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-09-07 16:20:57 +0200 |
| commit | d4d5ed59f98eb3218418c385327224d2512e518e (patch) | |
| tree | a90cdac58c8e7e30f8fece0f2dc5012fd2ce619a /app/assets/javascripts/diffs/components/diff_file.vue | |
| parent | 982da16bf2960d13f7f67f45b29f53795d3dbd5c (diff) | |
| download | gitlab-ce-d4d5ed59f98eb3218418c385327224d2512e518e.tar.gz | |
Fixes based on MR discussion around naming, mutations, handling of state
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_file.vue')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_file.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index a0197e95456..67e85c4eee3 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -49,7 +49,8 @@ export default { !this.isCollapsed && !this.file.highlightedDiffLines && !this.isLoadingCollapsedDiff && - !this.file.tooLarge + !this.file.tooLarge && + this.file.text ); }, showLoadingIcon() { @@ -76,7 +77,6 @@ export default { this.file.collapsed = false; this.file.renderIt = true; }) - .then(() => this.$nextTick()) .then(() => { requestIdleCallback( () => { @@ -149,7 +149,7 @@ export default { class="diff-content loading" /> <div - v-if="showExpandMessage" + v-else-if="showExpandMessage" class="nothing-here-block diff-collapsed" > {{ __('This diff is collapsed.') }} |