diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-15 13:44:55 -0600 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-15 13:44:55 -0600 |
commit | 27a6d65c616b58fdce5d7eba7a11b7ef7b2c8d28 (patch) | |
tree | 198c7153bf739ed26a5b74c6d5ee2c071c53aaec /app | |
parent | efdde042a3299668957d16200a407b9daae52301 (diff) | |
download | gitlab-ce-27a6d65c616b58fdce5d7eba7a11b7ef7b2c8d28.tar.gz |
Add dispatcher imports for job details bundle
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/jobs/job_details_bundle.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/jobs/show/index.js | 3 | ||||
-rw-r--r-- | app/views/projects/jobs/show.html.haml | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index e4288dc1317..2e5209c6bf1 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -192,6 +192,11 @@ var Dispatcher; .catch(fail); shortcut_handler = true; break; + case 'projects:jobs:show': + import('./pages/projects/jobs/show') + .then(callDefault) + .catch(fail); + break; case 'projects:merge_requests:creations:new': import('./pages/projects/merge_requests/creations/new') .then(callDefault) diff --git a/app/assets/javascripts/jobs/job_details_bundle.js b/app/assets/javascripts/jobs/job_details_bundle.js index db53b04de0e..85a88ae409b 100644 --- a/app/assets/javascripts/jobs/job_details_bundle.js +++ b/app/assets/javascripts/jobs/job_details_bundle.js @@ -3,7 +3,7 @@ import JobMediator from './job_details_mediator'; import jobHeader from './components/header.vue'; import detailsBlock from './components/sidebar_details_block.vue'; -document.addEventListener('DOMContentLoaded', () => { +export default () => { const dataset = document.getElementById('js-job-details-vue').dataset; const mediator = new JobMediator({ endpoint: dataset.endpoint }); @@ -55,4 +55,4 @@ document.addEventListener('DOMContentLoaded', () => { }); }, }); -}); +}; diff --git a/app/assets/javascripts/pages/projects/jobs/show/index.js b/app/assets/javascripts/pages/projects/jobs/show/index.js new file mode 100644 index 00000000000..cecbfb82946 --- /dev/null +++ b/app/assets/javascripts/pages/projects/jobs/show/index.js @@ -0,0 +1,3 @@ +import initJobDetails from '~/jobs/job_details_bundle'; + +export default initJobDetails; diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index 93efa7e8e86..849c273db8c 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -112,7 +112,3 @@ .js-build-options{ data: javascript_build_options } #js-job-details-vue{ data: { endpoint: project_job_path(@project, @build, format: :json) } } - -- content_for :page_specific_javascripts do - = webpack_bundle_tag('common_vue') - = webpack_bundle_tag('job_details') |