diff --git a/app/assets/javascripts/pages/projects/blob/show/index.js b/app/assets/javascripts/pages/projects/blob/show/index.js index 1fdc0e863189217a9d210f0a836f3379eebd7e41..b4fdb8fb295b767e98e01c21e724729d04990197 100644 --- a/app/assets/javascripts/pages/projects/blob/show/index.js +++ b/app/assets/javascripts/pages/projects/blob/show/index.js @@ -26,6 +26,8 @@ import HighlightWorker from '~/vue_shared/components/source_viewer/workers/highl import initAmbiguousRefModal from '~/ref/init_ambiguous_ref_modal'; import { InternalEvents } from '~/tracking'; import { initFindFileShortcut } from '~/projects/behaviors'; +import initHeaderApp from '~/repository/init_header_app'; +import createRouter from '~/repository/router'; Vue.use(Vuex); Vue.use(VueApollo); @@ -35,8 +37,6 @@ const apolloProvider = new VueApollo({ defaultClient: createDefaultClient(), }); -const router = new VueRouter({ mode: 'history' }); - const viewBlobEl = document.querySelector('#js-view-blob-app'); const initRefSwitcher = () => { @@ -84,6 +84,9 @@ if (viewBlobEl) { canDownloadCode, ...dataset } = viewBlobEl.dataset; + const router = createRouter(projectPath, originalBranch); + + initHeaderApp({ router, isBlobView: true }); // eslint-disable-next-line no-new new Vue({ @@ -215,7 +218,7 @@ if (treeHistoryLinkEl) { // eslint-disable-next-line no-new new Vue({ el: treeHistoryLinkEl, - router, + router: new VueRouter({ mode: 'history' }), render(h) { const url = generateHistoryUrl( historyLink, diff --git a/app/assets/javascripts/pages/projects/show/index.js b/app/assets/javascripts/pages/projects/show/index.js index 8c05fabbb24289096ff91f7cc86d08dc1c44fba8..2adbc94b99e68abd08f2fe8f9548a34a10580ecf 100644 --- a/app/assets/javascripts/pages/projects/show/index.js +++ b/app/assets/javascripts/pages/projects/show/index.js @@ -28,7 +28,7 @@ if (document.querySelector('.blob-viewer')) { import(/* webpackChunkName: 'blobViewer' */ '~/blob/viewer') .then(({ BlobViewer }) => { new BlobViewer(); // eslint-disable-line no-new - initHeaderApp(true); + initHeaderApp({ isReadmeView: true }); }) .catch(() => {}); } diff --git a/app/assets/javascripts/repository/components/header_area/blob_controls.vue b/app/assets/javascripts/repository/components/header_area/blob_controls.vue index 2202faf7b840fc4c8eafc722f877148721163a77..ddc5af4f43a937b242c6384e334132b8a37e1bba 100644 --- a/app/assets/javascripts/repository/components/header_area/blob_controls.vue +++ b/app/assets/javascripts/repository/components/header_area/blob_controls.vue @@ -157,7 +157,7 @@ export default {