Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 7 deletions

diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue
index bf4f19504f0..f6d370fb450 100644
--- a/app/assets/javascripts/repository/components/blob_content_viewer.vue
+++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue
@@ -189,15 +189,10 @@ export default {
       axios
         .get(`${this.blobInfo.webPath}?format=json&viewer=${type}`)
         .then(async ({ data: { html, binary } }) => {
-          if (type === SIMPLE_BLOB_VIEWER) {
-            this.isRenderingLegacyTextViewer = true;
+          this.isRenderingLegacyTextViewer = true;
 
+          if (type === SIMPLE_BLOB_VIEWER) {
             this.legacySimpleViewer = html;
-
-            window.requestIdleCallback(() => {
-              this.isRenderingLegacyTextViewer = false;
-              new LineHighlighter(); // eslint-disable-line no-new
-            });
           } else {
             this.legacyRichViewer = html;
           }
@@ -205,6 +200,14 @@ export default {
           this.isBinary = binary;
           this.isLoadingLegacyViewer = false;
 
+          window.requestIdleCallback(() => {
+            this.isRenderingLegacyTextViewer = false;
+
+            if (type === SIMPLE_BLOB_VIEWER) {
+              new LineHighlighter(); // eslint-disable-line no-new
+            }
+          });
+
           await this.$nextTick();
           handleLocationHash(); // Ensures that we scroll to the hash when async content is loaded
         })