updated more dispatcher routes

26 files changed, 35 insertions, 147 deletions

diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 775aed62d5e..c4f7ed71bb4 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -51,91 +51,15 @@ var Dispatcher;
         case 'projects:merge_requests:creations:new':
         case 'projects:merge_requests:creations:diffs':
         case 'projects:merge_requests:edit':
-          shortcut_handler = true;
-          break;
-        case 'projects:services:edit':
-          import('./pages/projects/services/edit')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'snippets:new':
-          import('./pages/snippets/new')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'snippets:edit':
-          import('./pages/snippets/edit')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'snippets:create':
-          import('./pages/snippets/new')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'snippets:update':
-          import('./pages/snippets/edit')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects:releases:edit':
-          import('./pages/projects/releases/edit')
-            .then(callDefault)
-            .catch(fail);
-          break;
         case 'projects:merge_requests:show':
-          import('./pages/projects/merge_requests/show')
-            .then(callDefault)
-            .catch(fail);
-          shortcut_handler = true;
-          break;
-        case 'dashboard:activity':
-          import('./pages/dashboard/activity')
-            .then(callDefault)
-            .catch(fail);
-          break;
         case 'projects:commit:show':
-          import('./pages/projects/commit/show')
-            .then(callDefault)
-            .catch(fail);
-          shortcut_handler = true;
-          break;
-        case 'projects:commit:pipelines':
-          import('./pages/projects/commit/pipelines')
-            .then(callDefault)
-            .catch(fail);
-          break;
         case 'projects:activity':
-          import('./pages/projects/activity')
-            .then(callDefault)
-            .catch(fail);
-          shortcut_handler = true;
-          break;
-        case 'projects:commits:show':
-          import('./pages/projects/commits/show')
-            .then(callDefault)
-            .catch(fail);
-          shortcut_handler = true;
-          break;
         case 'projects:show':
+        case 'projects:commits:show':
+        case 'groups:show':
+        case 'projects:network:show':
           shortcut_handler = true;
           break;
-        case 'projects:edit':
-          import('./pages/projects/edit')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects:imports:show':
-          import('./pages/projects/imports/show')
-            .then(callDefault)
-            .catch(fail);
-          break;
-        case 'projects:pipelines:new':
-        case 'projects:pipelines:create':
-          import('./pages/projects/pipelines/new')
-            .then(callDefault)
-            .catch(fail);
-          break;
         case 'projects:pipelines:builds':
         case 'projects:pipelines:failures':
         case 'projects:pipelines:show':
@@ -148,9 +72,6 @@ var Dispatcher;
             .then(callDefault)
             .catch(fail);
           break;
-        case 'groups:show':
-          shortcut_handler = true;
-          break;
         case 'groups:group_members:index':
           import('./pages/groups/group_members/index')
             .then(callDefault)
@@ -237,11 +158,6 @@ var Dispatcher;
             .then(callDefault)
             .catch(fail);
           break;
-        case 'projects:network:show':
-          // Ensure we don't create a particular shortcut handler here. This is
-          // already created, where the network graph is created.
-          shortcut_handler = true;
-          break;
         case 'projects:forks:new':
           import('./pages/projects/forks/new')
             .then(callDefault)
diff --git a/app/assets/javascripts/init_notes.js b/app/assets/javascripts/init_notes.js
index 882aedfcc76..d6bdfbf8884 100644
--- a/app/assets/javascripts/init_notes.js
+++ b/app/assets/javascripts/init_notes.js
@@ -2,6 +2,9 @@ import Notes from './notes';
 
 export default () => {
   const dataEl = document.querySelector('.js-notes-data');
+
+  if (!dataEl) return;
+
   const {
     notesUrl,
     notesIds,
diff --git a/app/assets/javascripts/pages/dashboard/activity/index.js b/app/assets/javascripts/pages/dashboard/activity/index.js
index 95faf1f1e98..1b887cad496 100644
--- a/app/assets/javascripts/pages/dashboard/activity/index.js
+++ b/app/assets/javascripts/pages/dashboard/activity/index.js
@@ -1,3 +1,3 @@
 import Activities from '~/activities';
 
-export default () => new Activities();
+document.addEventListener('DOMContentLoaded', () => new Activities());
diff --git a/app/assets/javascripts/pages/groups/milestones/create/index.js b/app/assets/javascripts/pages/groups/milestones/create/index.js
deleted file mode 100644
index ddd10fe5062..00000000000
--- a/app/assets/javascripts/pages/groups/milestones/create/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import initForm from '../../../../shared/milestones/form';
-
-document.addEventListener('DOMContentLoaded', () => initForm(false));
diff --git a/app/assets/javascripts/pages/groups/milestones/update/index.js b/app/assets/javascripts/pages/groups/milestones/update/index.js
deleted file mode 100644
index ddd10fe5062..00000000000
--- a/app/assets/javascripts/pages/groups/milestones/update/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import initForm from '../../../../shared/milestones/form';
-
-document.addEventListener('DOMContentLoaded', () => initForm(false));
diff --git a/app/assets/javascripts/pages/projects/activity/index.js b/app/assets/javascripts/pages/projects/activity/index.js
index 7af95127fd5..5543ad82428 100644
--- a/app/assets/javascripts/pages/projects/activity/index.js
+++ b/app/assets/javascripts/pages/projects/activity/index.js
@@ -1,7 +1,7 @@
 import Activities from '~/activities';
 import ShortcutsNavigation from '~/shortcuts_navigation';
 
-export default function () {
+document.addEventListener('DOMContentLoaded', () => {
   new Activities(); // eslint-disable-line no-new
   new ShortcutsNavigation(); // eslint-disable-line no-new
-}
+});
diff --git a/app/assets/javascripts/pages/projects/branches/create/index.js b/app/assets/javascripts/pages/projects/branches/create/index.js
deleted file mode 100644
index dcc382f7134..00000000000
--- a/app/assets/javascripts/pages/projects/branches/create/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import NewBranchForm from '~/new_branch_form';
-
-document.addEventListener('DOMContentLoaded', () => {
-  // eslint-disable-next-line no-new
-  new NewBranchForm($('.js-create-branch-form'), JSON.parse(document.getElementById('availableRefs').innerHTML));
-});
diff --git a/app/assets/javascripts/pages/projects/commit/show/index.js b/app/assets/javascripts/pages/projects/commit/index.js
index 5ac38e6f278..460a54ab504 100644
--- a/app/assets/javascripts/pages/projects/commit/show/index.js
+++ b/app/assets/javascripts/pages/projects/commit/index.js
@@ -7,7 +7,7 @@ import initNotes from '~/init_notes';
 import initChangesDropdown from '~/init_changes_dropdown';
 import { fetchCommitMergeRequests } from '~/commit_merge_requests';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new Diff();
   new ZenMode();
   new ShortcutsNavigation();
@@ -19,4 +19,4 @@ export default () => {
   initChangesDropdown(document.querySelector('.navbar-gitlab').offsetHeight - stickyBarPaddingTop);
   $('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath);
   fetchCommitMergeRequests();
-};
+});
diff --git a/app/assets/javascripts/pages/projects/commit/pipelines/index.js b/app/assets/javascripts/pages/projects/commit/pipelines/index.js
index 523ad567021..7889704a324 100644
--- a/app/assets/javascripts/pages/projects/commit/pipelines/index.js
+++ b/app/assets/javascripts/pages/projects/commit/pipelines/index.js
@@ -1,8 +1,8 @@
 import MiniPipelineGraph from '~/mini_pipeline_graph_dropdown';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new MiniPipelineGraph({
     container: '.js-commit-pipeline-graph',
   }).bindEvents();
   $('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath);
-};
+});
diff --git a/app/assets/javascripts/pages/projects/commits/show/index.js b/app/assets/javascripts/pages/projects/commits/show/index.js
index 6110fda17de..3682020579b 100644
--- a/app/assets/javascripts/pages/projects/commits/show/index.js
+++ b/app/assets/javascripts/pages/projects/commits/show/index.js
@@ -2,8 +2,8 @@ import CommitsList from '~/commits';
 import GpgBadges from '~/gpg_badges';
 import ShortcutsNavigation from '~/shortcuts_navigation';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new CommitsList(document.querySelector('.js-project-commits-show').dataset.commitsLimit); // eslint-disable-line no-new
   new ShortcutsNavigation(); // eslint-disable-line no-new
   GpgBadges.fetch();
-};
+});
diff --git a/app/assets/javascripts/pages/projects/edit/index.js b/app/assets/javascripts/pages/projects/edit/index.js
index 9edf36d66b1..064de22dfd6 100644
--- a/app/assets/javascripts/pages/projects/edit/index.js
+++ b/app/assets/javascripts/pages/projects/edit/index.js
@@ -4,11 +4,11 @@ import ProjectNew from '../shared/project_new';
 import projectAvatar from '../shared/project_avatar';
 import initProjectPermissionsSettings from '../shared/permissions';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new ProjectNew(); // eslint-disable-line no-new
   setupProjectEdit();
   // Initialize expandable settings panels
   initSettingsPanels();
   projectAvatar();
   initProjectPermissionsSettings();
-};
+});
diff --git a/app/assets/javascripts/pages/projects/imports/show/index.js b/app/assets/javascripts/pages/projects/imports/show/index.js
index 378f7b3f38b..d5f92baf054 100644
--- a/app/assets/javascripts/pages/projects/imports/show/index.js
+++ b/app/assets/javascripts/pages/projects/imports/show/index.js
@@ -1,5 +1,5 @@
 import ProjectImport from '~/project_import';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new ProjectImport(); // eslint-disable-line no-new
-};
+});
diff --git a/app/assets/javascripts/pages/projects/merge_requests/show/index.js b/app/assets/javascripts/pages/projects/merge_requests/show/index.js
index c3463c266e3..d1ef141f17c 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/show/index.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/show/index.js
@@ -6,7 +6,7 @@ import ShortcutsIssuable from '~/shortcuts_issuable';
 import Diff from '~/diff';
 import { handleLocationHash } from '~/lib/utils/common_utils';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new Diff(); // eslint-disable-line no-new
   new ZenMode(); // eslint-disable-line no-new
 
@@ -21,4 +21,4 @@ export default () => {
 
   new ShortcutsIssuable(true); // eslint-disable-line no-new
   handleLocationHash();
-};
+});
diff --git a/app/assets/javascripts/pages/projects/milestones/create/index.js b/app/assets/javascripts/pages/projects/milestones/create/index.js
deleted file mode 100644
index 9a4ebf9890d..00000000000
--- a/app/assets/javascripts/pages/projects/milestones/create/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import initForm from '../../../../shared/milestones/form';
-
-document.addEventListener('DOMContentLoaded', () => initForm());
diff --git a/app/assets/javascripts/pages/projects/milestones/update/index.js b/app/assets/javascripts/pages/projects/milestones/update/index.js
deleted file mode 100644
index 9a4ebf9890d..00000000000
--- a/app/assets/javascripts/pages/projects/milestones/update/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import initForm from '../../../../shared/milestones/form';
-
-document.addEventListener('DOMContentLoaded', () => initForm());
diff --git a/app/assets/javascripts/pages/projects/pipelines/new/index.js b/app/assets/javascripts/pages/projects/pipelines/new/index.js
index c54cc62bf05..e03d2c5e863 100644
--- a/app/assets/javascripts/pages/projects/pipelines/new/index.js
+++ b/app/assets/javascripts/pages/projects/pipelines/new/index.js
@@ -1,5 +1,5 @@
 import NewBranchForm from '../../../../new_branch_form';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   new NewBranchForm($('.js-new-pipeline-form')); // eslint-disable-line no-new
-};
+});
diff --git a/app/assets/javascripts/pages/projects/releases/edit/index.js b/app/assets/javascripts/pages/projects/releases/edit/index.js
index 3d997cdfff0..0bf53a8de09 100644
--- a/app/assets/javascripts/pages/projects/releases/edit/index.js
+++ b/app/assets/javascripts/pages/projects/releases/edit/index.js
@@ -1,3 +1,3 @@
 import initForm from '~/pages/projects/init_form';
 
-export default initForm($('.release-form'));
+document.addEventListener('DOMContentLoaded', () => initForm($('.release-form')));
diff --git a/app/assets/javascripts/pages/projects/services/edit/index.js b/app/assets/javascripts/pages/projects/services/edit/index.js
index 5c73171e62e..ba4b271f09e 100644
--- a/app/assets/javascripts/pages/projects/services/edit/index.js
+++ b/app/assets/javascripts/pages/projects/services/edit/index.js
@@ -1,7 +1,7 @@
 import IntegrationSettingsForm from '~/integrations/integration_settings_form';
 import PrometheusMetrics from '~/prometheus_metrics/prometheus_metrics';
 
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
   const prometheusSettingsWrapper = document.querySelector('.js-prometheus-metrics-monitoring');
   const integrationSettingsForm = new IntegrationSettingsForm('.js-integration-settings-form');
   integrationSettingsForm.init();
@@ -10,4 +10,4 @@ export default () => {
     const prometheusMetrics = new PrometheusMetrics('.js-prometheus-metrics-monitoring');
     prometheusMetrics.loadActiveMetrics();
   }
-};
+});
diff --git a/app/assets/javascripts/pages/projects/snippets/create/index.js b/app/assets/javascripts/pages/projects/snippets/create/index.js
deleted file mode 100644
index caf9ee9b398..00000000000
--- a/app/assets/javascripts/pages/projects/snippets/create/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import initForm from '~/pages/projects/init_form';
-
-document.addEventListener('DOMContentLoaded', () => initForm($('.snippet-form')));
diff --git a/app/assets/javascripts/pages/projects/snippets/update/index.js b/app/assets/javascripts/pages/projects/snippets/update/index.js
deleted file mode 100644
index caf9ee9b398..00000000000
--- a/app/assets/javascripts/pages/projects/snippets/update/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import initForm from '~/pages/projects/init_form';
-
-document.addEventListener('DOMContentLoaded', () => initForm($('.snippet-form')));
diff --git a/app/assets/javascripts/pages/snippets/edit/index.js b/app/assets/javascripts/pages/snippets/edit/index.js
index 9c664b5f1ff..e9c5d31373b 100644
--- a/app/assets/javascripts/pages/snippets/edit/index.js
+++ b/app/assets/javascripts/pages/snippets/edit/index.js
@@ -1,3 +1,3 @@
 import form from '../form';
 
-export default form;
+document.addEventListener('DOMContentLoaded', () => form());
diff --git a/app/assets/javascripts/pages/snippets/form.js b/app/assets/javascripts/pages/snippets/form.js
index f996d3cd74e..1201d7e0fdd 100644
--- a/app/assets/javascripts/pages/snippets/form.js
+++ b/app/assets/javascripts/pages/snippets/form.js
@@ -1,7 +1,14 @@
+/* global ace */
 import GLForm from '~/gl_form';
 import ZenMode from '~/zen_mode';
 
 export default () => {
+  const editor = ace.edit('editor');
+
   new GLForm($('.snippet-form'), false); // eslint-disable-line no-new
   new ZenMode(); // eslint-disable-line no-new
+
+  $('.snippet-form-holder form').on('submit', () => {
+    $('.snippet-file-content').val(editor.getValue());
+  });
 };
diff --git a/app/assets/javascripts/pages/snippets/new/index.js b/app/assets/javascripts/pages/snippets/new/index.js
index 9c664b5f1ff..e9c5d31373b 100644
--- a/app/assets/javascripts/pages/snippets/new/index.js
+++ b/app/assets/javascripts/pages/snippets/new/index.js
@@ -1,3 +1,3 @@
 import form from '../form';
 
-export default form;
+document.addEventListener('DOMContentLoaded', () => form());
diff --git a/app/assets/javascripts/snippet/snippet_bundle.js b/app/assets/javascripts/snippet/snippet_bundle.js
deleted file mode 100644
index a98403f4cf2..00000000000
--- a/app/assets/javascripts/snippet/snippet_bundle.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/* eslint-disable func-names, space-before-function-paren, prefer-arrow-callback, no-var, quotes, max-len */
-/* global ace */
-
-(function() {
-  $(function() {
-    var editor = ace.edit("editor");
-
-    $(".snippet-form-holder form").on('submit', function() {
-      $(".snippet-file-content").val(editor.getValue());
-    });
-  });
-}).call(window);
diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml
index 43322978749..c75c882a693 100644
--- a/app/views/shared/snippets/_form.html.haml
+++ b/app/views/shared/snippets/_form.html.haml
@@ -1,6 +1,5 @@
 - content_for :page_specific_javascripts do
   = page_specific_javascript_tag('lib/ace.js')
-  = page_specific_javascript_bundle_tag('snippet')
 
 .snippet-form-holder
   = form_for @snippet, url: url, html: { class: "form-horizontal snippet-form js-requires-input js-quick-submit common-note-form" } do |f|
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 5ec33533b4f..a0d3d989e9a 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -86,7 +86,6 @@ var config = {
     registry_list:        './registry/index.js',
     ide:                 './ide/index.js',
     sidebar:              './sidebar/sidebar_bundle.js',
-    snippet:              './snippet/snippet_bundle.js',
     sketch_viewer:        './blob/sketch_viewer.js',
     stl_viewer:           './blob/stl_viewer.js',
     terminal:             './terminal/terminal_bundle.js',