diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-23 15:09:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-23 15:09:30 +0300 |
| commit | f46d20e5088ca9c58793e3b6044facfa74feb7ed (patch) | |
| tree | 5affa9b7fb8837a0cef99f0efa4229f019fe38fc /app/assets/javascripts/repository | |
| parent | 17f2e5035c716bccb6bd7073215e9b2d449184e7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/repository')
| -rw-r--r-- | app/assets/javascripts/repository/components/blob_content_viewer.vue | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue index 280455c3fed..bf4f19504f0 100644 --- a/app/assets/javascripts/repository/components/blob_content_viewer.vue +++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue @@ -97,6 +97,7 @@ export default { project: DEFAULT_BLOB_INFO.project, gitpodEnabled: DEFAULT_BLOB_INFO.gitpodEnabled, currentUser: DEFAULT_BLOB_INFO.currentUser, + useFallback: false, }; }, computed: { @@ -130,7 +131,7 @@ export default { }, shouldLoadLegacyViewer() { const isTextFile = this.viewer.fileType === TEXT_FILE_TYPE && !this.glFeatures.highlightJs; - return isTextFile || LEGACY_FILE_TYPES.includes(this.blobInfo.fileType); + return isTextFile || LEGACY_FILE_TYPES.includes(this.blobInfo.fileType) || this.useFallback; }, legacyViewerLoaded() { return ( @@ -173,6 +174,10 @@ export default { }, }, methods: { + onError() { + this.useFallback = true; + this.loadLegacyViewer(); + }, loadLegacyViewer() { if (this.legacyViewerLoaded) { return; @@ -303,7 +308,7 @@ export default { :loading="isLoadingLegacyViewer" :data-loading="isRenderingLegacyTextViewer" /> - <component :is="blobViewer" v-else :blob="blobInfo" class="blob-viewer" /> + <component :is="blobViewer" v-else :blob="blobInfo" class="blob-viewer" @error="onError" /> <code-intelligence v-if="blobViewer || legacyViewerLoaded" :code-navigation-path="blobInfo.codeNavigationPath" |