Commit ddf0d0c9 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'refactor-jobs-show-haml' into 'master'

Add dispatcher imports for job details bundle

See merge request gitlab-org/gitlab-ce!17157
parents c1afae24 e8d4708b
...@@ -3,7 +3,7 @@ import JobMediator from './job_details_mediator'; ...@@ -3,7 +3,7 @@ import JobMediator from './job_details_mediator';
import jobHeader from './components/header.vue'; import jobHeader from './components/header.vue';
import detailsBlock from './components/sidebar_details_block.vue'; import detailsBlock from './components/sidebar_details_block.vue';
document.addEventListener('DOMContentLoaded', () => { export default () => {
const dataset = document.getElementById('js-job-details-vue').dataset; const dataset = document.getElementById('js-job-details-vue').dataset;
const mediator = new JobMediator({ endpoint: dataset.endpoint }); const mediator = new JobMediator({ endpoint: dataset.endpoint });
...@@ -55,4 +55,4 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -55,4 +55,4 @@ document.addEventListener('DOMContentLoaded', () => {
}); });
}, },
}); });
}); };
import initJobDetails from '~/jobs/job_details_bundle';
document.addEventListener('DOMContentLoaded', initJobDetails);
...@@ -112,7 +112,3 @@ ...@@ -112,7 +112,3 @@
.js-build-options{ data: javascript_build_options } .js-build-options{ data: javascript_build_options }
#js-job-details-vue{ data: { endpoint: project_job_path(@project, @build, format: :json) } } #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')
...@@ -64,7 +64,6 @@ var config = { ...@@ -64,7 +64,6 @@ var config = {
filtered_search: './filtered_search/filtered_search_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js',
help: './help/help.js', help: './help/help.js',
issue_show: './issue_show/index.js', issue_show: './issue_show/index.js',
job_details: './jobs/job_details_bundle.js',
locale: './locale/index.js', locale: './locale/index.js',
main: './main.js', main: './main.js',
merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js',
...@@ -254,7 +253,6 @@ var config = { ...@@ -254,7 +253,6 @@ var config = {
'filtered_search', 'filtered_search',
'groups', 'groups',
'issue_show', 'issue_show',
'job_details',
'merge_conflicts', 'merge_conflicts',
'monitoring', 'monitoring',
'notebook_viewer', 'notebook_viewer',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment