diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-08-10 13:09:01 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-08-14 11:00:06 -0500 |
| commit | 06c330954e030e30e9e8284110907c53b206e447 (patch) | |
| tree | d528688c2d0d5dc7bcc68aadd5d5fb97d0e17a83 | |
| parent | d59aed94e7ec441f44301a55e0529a9c34a01fd2 (diff) | |
| download | gitlab-ce-06c330954e030e30e9e8284110907c53b206e447.tar.gz | |
Use v-else instead of duplicating logic
Fix
http://192.168.1.135:3000/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/broadcast_message.js
| -rw-r--r-- | app/assets/javascripts/repo/components/repo_preview.vue | 20 | ||||
| -rw-r--r-- | app/assets/javascripts/repo/helpers/repo_helper.js | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/app/assets/javascripts/repo/components/repo_preview.vue b/app/assets/javascripts/repo/components/repo_preview.vue index 0caa3a4551a..2200754cbef 100644 --- a/app/assets/javascripts/repo/components/repo_preview.vue +++ b/app/assets/javascripts/repo/components/repo_preview.vue @@ -30,9 +30,23 @@ export default { <template> <div> - <div v-if="!activeFile.render_error" v-html="activeFile.html"></div> - <div v-if="activeFile.render_error" class="vertical-center render-error"> - <p class="text-center">The source could not be displayed because it is too large. You can <a :href="activeFile.raw_path">download</a> it instead.</p> + <div + v-if="!activeFile.render_error" + v-html="activeFile.html"> + </div> + <div + v-else-if="activeFile.tooLarge" + class="vertical-center render-error"> + <p class="text-center"> + The source could not be displayed because it is too large. You can <a :href="activeFile.raw_path">download</a> it instead. + </p> + </div> + <div + v-else + class="vertical-center render-error"> + <p class="text-center"> + The source could not be displayed because a rendering error occured. You can <a :href="activeFile.raw_path">download</a> it instead. + </p> </div> </div> </template> diff --git a/app/assets/javascripts/repo/helpers/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js index fee98c12592..b12ea92c17a 100644 --- a/app/assets/javascripts/repo/helpers/repo_helper.js +++ b/app/assets/javascripts/repo/helpers/repo_helper.js @@ -190,7 +190,7 @@ const RepoHelper = { newFile.url = file.url || location.pathname; newFile.url = file.url; - if (newFile.render_error === 'too_large') { + if (newFile.render_error === 'too_large' || newFile.render_error === 'collapsed') { newFile.tooLarge = true; } newFile.newContent = ''; |