diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-10 16:41:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-10 16:41:36 +0000 |
| commit | d81794ad4992aa234a8916088616c0faac731e49 (patch) | |
| tree | 8769629a000dfd4405f32bceb6950fd0aa9c7ca2 /app/assets/javascripts | |
| parent | 566ee14516ac54e52c4dfaf40d10bc5f2abc3627 (diff) | |
| parent | 00fc9f260706cfd6d6f4261eea24eb3ff455b3e0 (diff) | |
| download | gitlab-ce-d81794ad4992aa234a8916088616c0faac731e49.tar.gz | |
Merge branch 'dm-async-tree-readme' into 'master'
Load tree readme asynchronously
See merge request !11191
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/blob/viewer/index.js | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js index 07d67d49aa5..69ff2f95799 100644 --- a/app/assets/javascripts/blob/viewer/index.js +++ b/app/assets/javascripts/blob/viewer/index.js @@ -8,7 +8,10 @@ export default class BlobViewer { this.richViewer = document.querySelector('.blob-viewer[data-type="rich"]'); this.$fileHolder = $('.file-holder'); - let initialViewerName = document.querySelector('.blob-viewer:not(.hidden)').getAttribute('data-type'); + const initialViewer = document.querySelector('.blob-viewer:not(.hidden)'); + if (!initialViewer) return; + + let initialViewerName = initialViewer.getAttribute('data-type'); this.initBindings(); diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index abb871c3af0..43ad127a4db 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -246,6 +246,7 @@ const ShortcutsBlob = require('./shortcuts_blob'); new NotificationsForm(); if ($('#tree-slider').length) { new TreeView(); + new BlobViewer(); } break; case 'projects:pipelines:builds': @@ -300,6 +301,7 @@ const ShortcutsBlob = require('./shortcuts_blob'); case 'projects:tree:show': shortcut_handler = new ShortcutsNavigation(); new TreeView(); + new BlobViewer(); gl.TargetBranchDropDown.bootstrap(); break; case 'projects:find_file:show': |