diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-20 21:30:11 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-20 21:30:11 +0000 |
| commit | ddf0d0c9d1d2e39ca64fc042a221cb02408b866a (patch) | |
| tree | 31189df2ed96c65699c3dd3a4f387cff30ea32ee | |
| parent | c1afae24fbe978d489e469d393147cbd1108acbd (diff) | |
| parent | e8d4708be9e050e7eb9aaa5db63a37f965146e57 (diff) | |
| download | gitlab-ce-ddf0d0c9d1d2e39ca64fc042a221cb02408b866a.tar.gz | |
Merge branch 'refactor-jobs-show-haml' into 'master'
Add dispatcher imports for job details bundle
See merge request gitlab-org/gitlab-ce!17157
| -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 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
4 files changed, 5 insertions, 8 deletions
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..3626f3ffec6 --- /dev/null +++ b/app/assets/javascripts/pages/projects/jobs/show/index.js @@ -0,0 +1,3 @@ +import initJobDetails from '~/jobs/job_details_bundle'; + +document.addEventListener('DOMContentLoaded', 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') diff --git a/config/webpack.config.js b/config/webpack.config.js index d4e9d271c3d..defbfc848d3 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -64,7 +64,6 @@ var config = { filtered_search: './filtered_search/filtered_search_bundle.js', help: './help/help.js', issue_show: './issue_show/index.js', - job_details: './jobs/job_details_bundle.js', locale: './locale/index.js', main: './main.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', @@ -254,7 +253,6 @@ var config = { 'filtered_search', 'groups', 'issue_show', - 'job_details', 'merge_conflicts', 'monitoring', 'notebook_viewer', |