diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 00:08:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 00:08:13 +0300 |
| commit | d3c29eae5c389e36d4751539fad0462053fb2b20 (patch) | |
| tree | cc3ae497193f9334d0bc6ee4224637102f6e0d4e /app/assets/javascripts | |
| parent | ad4dbe36445360521fc73a57df13bc8f12eeaa92 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_file.vue | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 048dc274cf2..8babc05f1ce 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -179,18 +179,19 @@ export default { <div v-if="errorMessage" class="diff-viewer"> <div class="nothing-here-block" v-html="errorMessage"></div> </div> - <div v-else-if="isCollapsed" class="nothing-here-block diff-collapsed"> - {{ __('This diff is collapsed.') }} - <a class="click-to-expand js-click-to-expand" href="#" @click.prevent="handleToggle">{{ - __('Click to expand it.') - }}</a> - </div> - <diff-content - v-else - :class="{ hidden: isCollapsed || isFileTooLarge }" - :diff-file="file" - :help-page-path="helpPagePath" - /> + <template v-else> + <div v-show="isCollapsed" class="nothing-here-block diff-collapsed"> + {{ __('This diff is collapsed.') }} + <a class="click-to-expand js-click-to-expand" href="#" @click.prevent="handleToggle">{{ + __('Click to expand it.') + }}</a> + </div> + <diff-content + v-show="!isCollapsed && !isFileTooLarge" + :diff-file="file" + :help-page-path="helpPagePath" + /> + </template> </div> </template> </div> |