diff options
3 files changed, 47 insertions, 7 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 0c784084b0d..28f4fddad4b 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -246,14 +246,16 @@ import Activities from './activities'; }); } case 'projects:merge_requests:creations:diffs': + import('./pages/projects/merge_requests/creations/diffs') + .then(callDefault) + .catch(fail); + shortcut_handler = true; + break; case 'projects:merge_requests:edit': - new Diff(); - shortcut_handler = new ShortcutsNavigation(); - new GLForm($('.merge-request-form'), true); - new IssuableForm($('.merge-request-form')); - new LabelsSelect(); - new MilestoneSelect(); - new IssuableTemplateSelectors(); + import('./pages/projects/merge_requests/edit') + .then(callDefault) + .catch(fail); + shortcut_handler = true; break; case 'projects:tags:new': import('./pages/projects/tags/new') diff --git a/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js b/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js new file mode 100644 index 00000000000..57e3b11000c --- /dev/null +++ b/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js @@ -0,0 +1,19 @@ +import Diff from '~/diff'; +import ShortcutsNavigation from '~/shortcuts_navigation'; +import GLForm from '~/gl_form'; +import IssuableForm from '~/issuable_form'; +import LabelsSelect from '~/labels_select'; +import MilestoneSelect from '~/milestone_select'; +import IssuableTemplateSelectors from '~/templates/issuable_template_selectors'; +import AutoWidthDropdownSelect from '~/issuable/auto_width_dropdown_select'; + +export default () => { + new Diff(); // eslint-disable-line no-new + new ShortcutsNavigation(); // eslint-disable-line no-new + new GLForm($('.merge-request-form'), true); // eslint-disable-line no-new + new IssuableForm($('.merge-request-form')); // eslint-disable-line no-new + new LabelsSelect(); // eslint-disable-line no-new + new MilestoneSelect(); // eslint-disable-line no-new + new IssuableTemplateSelectors(); // eslint-disable-line no-new + new AutoWidthDropdownSelect($('.js-target-branch-select')).init(); // eslint-disable-line no-new +}; diff --git a/app/assets/javascripts/pages/projects/merge_requests/edit/index.js b/app/assets/javascripts/pages/projects/merge_requests/edit/index.js new file mode 100644 index 00000000000..57e3b11000c --- /dev/null +++ b/app/assets/javascripts/pages/projects/merge_requests/edit/index.js @@ -0,0 +1,19 @@ +import Diff from '~/diff'; +import ShortcutsNavigation from '~/shortcuts_navigation'; +import GLForm from '~/gl_form'; +import IssuableForm from '~/issuable_form'; +import LabelsSelect from '~/labels_select'; +import MilestoneSelect from '~/milestone_select'; +import IssuableTemplateSelectors from '~/templates/issuable_template_selectors'; +import AutoWidthDropdownSelect from '~/issuable/auto_width_dropdown_select'; + +export default () => { + new Diff(); // eslint-disable-line no-new + new ShortcutsNavigation(); // eslint-disable-line no-new + new GLForm($('.merge-request-form'), true); // eslint-disable-line no-new + new IssuableForm($('.merge-request-form')); // eslint-disable-line no-new + new LabelsSelect(); // eslint-disable-line no-new + new MilestoneSelect(); // eslint-disable-line no-new + new IssuableTemplateSelectors(); // eslint-disable-line no-new + new AutoWidthDropdownSelect($('.js-target-branch-select')).init(); // eslint-disable-line no-new +}; |