From afbb93080426062fba071feb00bcb65ec3a9c26c Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 01:43:18 -0600 Subject: migrate snippets:* to static bundle --- app/assets/javascripts/dispatcher.js | 20 -------------------- app/assets/javascripts/pages/snippets/edit/index.js | 2 +- app/assets/javascripts/pages/snippets/new/index.js | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 008b68eb661..f239df66818 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -80,26 +80,6 @@ var Dispatcher; .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) diff --git a/app/assets/javascripts/pages/snippets/edit/index.js b/app/assets/javascripts/pages/snippets/edit/index.js index 9c664b5f1ff..2ee38b64ca1 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/new/index.js b/app/assets/javascripts/pages/snippets/new/index.js index 9c664b5f1ff..2ee38b64ca1 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); -- cgit v1.2.1 From 20d428ea1dd322a95535a8ae84788569ba4bb273 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 01:48:24 -0600 Subject: migrate snippets:show to static bundle --- app/assets/javascripts/dispatcher.js | 5 ----- app/assets/javascripts/pages/snippets/show/index.js | 11 +++++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index f239df66818..b17c112ea00 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -294,11 +294,6 @@ var Dispatcher; .then(callDefault) .catch(fail); break; - case 'snippets:show': - import('./pages/snippets/show') - .then(callDefault) - .catch(fail); - break; case 'import:fogbugz:new_user_map': import('./pages/import/fogbugz/new_user_map') .then(callDefault) diff --git a/app/assets/javascripts/pages/snippets/show/index.js b/app/assets/javascripts/pages/snippets/show/index.js index 04c9562bfbb..f548b9fad65 100644 --- a/app/assets/javascripts/pages/snippets/show/index.js +++ b/app/assets/javascripts/pages/snippets/show/index.js @@ -1,12 +1,11 @@ -/* eslint-disable no-new */ import LineHighlighter from '../../../line_highlighter'; import BlobViewer from '../../../blob/viewer'; import ZenMode from '../../../zen_mode'; import initNotes from '../../../init_notes'; -export default () => { - new LineHighlighter(); - new BlobViewer(); +document.addEventListener('DOMContentLoaded', () => { + new LineHighlighter(); // eslint-disable-line no-new + new BlobViewer(); // eslint-disable-line no-new initNotes(); - new ZenMode(); -}; + new ZenMode(); // eslint-disable-line no-new +}); -- cgit v1.2.1 From 5d328db7dda525ddc1ea594f1e24752fbe45463a Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 01:55:40 -0600 Subject: migrate projects:snippets:* to static bundle --- app/assets/javascripts/dispatcher.js | 17 ----------------- .../javascripts/pages/projects/snippets/edit/index.js | 2 +- .../javascripts/pages/projects/snippets/new/index.js | 2 +- .../javascripts/pages/projects/snippets/show/index.js | 4 ++-- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index b17c112ea00..f99d97ab11d 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -58,28 +58,11 @@ var Dispatcher; .then(callDefault) .catch(fail); break; - case 'projects:snippets:show': - import('./pages/projects/snippets/show') - .then(callDefault) - .catch(fail); - break; - case 'projects:snippets:new': - case 'projects:snippets:create': - import('./pages/projects/snippets/new') - .then(callDefault) - .catch(fail); - break; case 'projects:services:edit': import('./pages/projects/services/edit') .then(callDefault) .catch(fail); break; - case 'projects:snippets:edit': - case 'projects:snippets:update': - import('./pages/projects/snippets/edit') - .then(callDefault) - .catch(fail); - break; case 'projects:releases:edit': import('./pages/projects/releases/edit') .then(callDefault) diff --git a/app/assets/javascripts/pages/projects/snippets/edit/index.js b/app/assets/javascripts/pages/projects/snippets/edit/index.js index 9edb16dc73b..caf9ee9b398 100644 --- a/app/assets/javascripts/pages/projects/snippets/edit/index.js +++ b/app/assets/javascripts/pages/projects/snippets/edit/index.js @@ -1,3 +1,3 @@ import initForm from '~/pages/projects/init_form'; -export default initForm($('.snippet-form')); +document.addEventListener('DOMContentLoaded', () => initForm($('.snippet-form'))); diff --git a/app/assets/javascripts/pages/projects/snippets/new/index.js b/app/assets/javascripts/pages/projects/snippets/new/index.js index 9edb16dc73b..caf9ee9b398 100644 --- a/app/assets/javascripts/pages/projects/snippets/new/index.js +++ b/app/assets/javascripts/pages/projects/snippets/new/index.js @@ -1,3 +1,3 @@ import initForm from '~/pages/projects/init_form'; -export default initForm($('.snippet-form')); +document.addEventListener('DOMContentLoaded', () => initForm($('.snippet-form'))); diff --git a/app/assets/javascripts/pages/projects/snippets/show/index.js b/app/assets/javascripts/pages/projects/snippets/show/index.js index a3cf75c385b..a134599cb04 100644 --- a/app/assets/javascripts/pages/projects/snippets/show/index.js +++ b/app/assets/javascripts/pages/projects/snippets/show/index.js @@ -3,9 +3,9 @@ import ZenMode from '~/zen_mode'; import LineHighlighter from '../../../../line_highlighter'; import BlobViewer from '../../../../blob/viewer'; -export default function () { +document.addEventListener('DOMContentLoaded', () => { new LineHighlighter(); // eslint-disable-line no-new new BlobViewer(); // eslint-disable-line no-new initNotes(); new ZenMode(); // eslint-disable-line no-new -} +}); -- cgit v1.2.1 From 9879487e4d83f61d3ae31c842599724f1dfc6052 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 01:59:16 -0600 Subject: migrate projects:tags:new to static bundle --- app/assets/javascripts/dispatcher.js | 5 ----- app/assets/javascripts/pages/projects/tags/new/index.js | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index f99d97ab11d..e2524695081 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -53,11 +53,6 @@ var Dispatcher; case 'projects:merge_requests:edit': shortcut_handler = true; break; - case 'projects:tags:new': - import('./pages/projects/tags/new') - .then(callDefault) - .catch(fail); - break; case 'projects:services:edit': import('./pages/projects/services/edit') .then(callDefault) diff --git a/app/assets/javascripts/pages/projects/tags/new/index.js b/app/assets/javascripts/pages/projects/tags/new/index.js index dacc2875c8c..191c98b36bb 100644 --- a/app/assets/javascripts/pages/projects/tags/new/index.js +++ b/app/assets/javascripts/pages/projects/tags/new/index.js @@ -2,8 +2,8 @@ import RefSelectDropdown from '../../../../ref_select_dropdown'; import ZenMode from '../../../../zen_mode'; import GLForm from '../../../../gl_form'; -export default () => { +document.addEventListener('DOMContentLoaded', () => { new ZenMode(); // eslint-disable-line no-new new GLForm($('.tag-form'), true); // eslint-disable-line no-new new RefSelectDropdown($('.js-branch-select')); // eslint-disable-line no-new -}; +}); -- cgit v1.2.1 From 6e33f999b35f20f022dc7cfcdc2ffa821254ebaa Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 02:00:16 -0600 Subject: migrate projects:services:edit to static bundle --- app/assets/javascripts/dispatcher.js | 5 ----- app/assets/javascripts/pages/projects/services/edit/index.js | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index e2524695081..a919b267d3e 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -53,11 +53,6 @@ var Dispatcher; case 'projects:merge_requests:edit': shortcut_handler = true; break; - case 'projects:services:edit': - import('./pages/projects/services/edit') - .then(callDefault) - .catch(fail); - break; case 'projects:releases:edit': import('./pages/projects/releases/edit') .then(callDefault) 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(); } -}; +}); -- cgit v1.2.1 From da0be7c5e610c83ac951dfaa8185c140fd40bcfe Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 02:01:49 -0600 Subject: migrate projects:releases:edit to static bundle --- app/assets/javascripts/dispatcher.js | 5 ----- app/assets/javascripts/pages/projects/releases/edit/index.js | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index a919b267d3e..9602225326d 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -53,11 +53,6 @@ var Dispatcher; case 'projects:merge_requests:edit': shortcut_handler = true; break; - case 'projects:releases:edit': - import('./pages/projects/releases/edit') - .then(callDefault) - .catch(fail); - break; case 'projects:merge_requests:show': shortcut_handler = true; break; 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'))); -- cgit v1.2.1 From 05b28636c653200b3f7619632a1952ac36fb7f37 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 02:05:18 -0600 Subject: migrate projects:merge_requests:show to static bundle --- app/assets/javascripts/dispatcher.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 9602225326d..54e554845c0 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -51,8 +51,6 @@ 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:merge_requests:show': shortcut_handler = true; break; -- cgit v1.2.1 From 25ce52b52615be4091027c70eecad59719b6fdd9 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 02:06:06 -0600 Subject: migrate dashboard:activity to static bundle --- app/assets/javascripts/dispatcher.js | 5 ----- app/assets/javascripts/pages/dashboard/activity/index.js | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 54e554845c0..661c12cdd2a 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -54,11 +54,6 @@ var Dispatcher; case 'projects:merge_requests:show': 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) 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()); -- cgit v1.2.1 From b679bc9cee58916c23b04ece45719688e25ccf46 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 02:16:46 -0600 Subject: migrate projects:clusters:* to static bundle --- app/assets/javascripts/dispatcher.js | 12 ------------ .../javascripts/pages/projects/clusters/destroy/index.js | 5 +++++ .../javascripts/pages/projects/clusters/index/index.js | 4 ++-- app/assets/javascripts/pages/projects/clusters/show/index.js | 4 ++-- .../javascripts/pages/projects/clusters/update/index.js | 5 +++++ 5 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 app/assets/javascripts/pages/projects/clusters/destroy/index.js create mode 100644 app/assets/javascripts/pages/projects/clusters/update/index.js diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 661c12cdd2a..123ca833731 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -270,18 +270,6 @@ var Dispatcher; .then(callDefault) .catch(fail); break; - case 'projects:clusters:show': - case 'projects:clusters:update': - case 'projects:clusters:destroy': - import('./pages/projects/clusters/show') - .then(callDefault) - .catch(fail); - break; - case 'projects:clusters:index': - import('./pages/projects/clusters/index') - .then(callDefault) - .catch(fail); - break; case 'dashboard:groups:index': import('./pages/dashboard/groups/index') .then(callDefault) diff --git a/app/assets/javascripts/pages/projects/clusters/destroy/index.js b/app/assets/javascripts/pages/projects/clusters/destroy/index.js new file mode 100644 index 00000000000..8001d2dd1da --- /dev/null +++ b/app/assets/javascripts/pages/projects/clusters/destroy/index.js @@ -0,0 +1,5 @@ +import ClustersBundle from '~/clusters/clusters_bundle'; + +document.addEventListener('DOMContentLoaded', () => { + new ClustersBundle(); // eslint-disable-line no-new +}); diff --git a/app/assets/javascripts/pages/projects/clusters/index/index.js b/app/assets/javascripts/pages/projects/clusters/index/index.js index d531ab81dc7..e4b8baede58 100644 --- a/app/assets/javascripts/pages/projects/clusters/index/index.js +++ b/app/assets/javascripts/pages/projects/clusters/index/index.js @@ -1,5 +1,5 @@ import ClustersIndex from '~/clusters/clusters_index'; -export default () => { +document.addEventListener('DOMContentLoaded', () => { new ClustersIndex(); // eslint-disable-line no-new -}; +}); diff --git a/app/assets/javascripts/pages/projects/clusters/show/index.js b/app/assets/javascripts/pages/projects/clusters/show/index.js index 0458c02a66f..8001d2dd1da 100644 --- a/app/assets/javascripts/pages/projects/clusters/show/index.js +++ b/app/assets/javascripts/pages/projects/clusters/show/index.js @@ -1,5 +1,5 @@ import ClustersBundle from '~/clusters/clusters_bundle'; -export default () => { +document.addEventListener('DOMContentLoaded', () => { new ClustersBundle(); // eslint-disable-line no-new -}; +}); diff --git a/app/assets/javascripts/pages/projects/clusters/update/index.js b/app/assets/javascripts/pages/projects/clusters/update/index.js new file mode 100644 index 00000000000..8001d2dd1da --- /dev/null +++ b/app/assets/javascripts/pages/projects/clusters/update/index.js @@ -0,0 +1,5 @@ +import ClustersBundle from '~/clusters/clusters_bundle'; + +document.addEventListener('DOMContentLoaded', () => { + new ClustersBundle(); // eslint-disable-line no-new +}); -- cgit v1.2.1 From 3b359ffe57e9ee632b6ebae5edc3de1230b06719 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 02:19:00 -0600 Subject: migrate sessions:* to static bundle --- app/assets/javascripts/dispatcher.js | 5 ----- app/assets/javascripts/pages/sessions/index.js | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 123ca833731..cba4509b20b 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -277,11 +277,6 @@ var Dispatcher; break; } switch (path[0]) { - case 'sessions': - import('./pages/sessions') - .then(callDefault) - .catch(fail); - break; case 'omniauth_callbacks': import('./pages/omniauth_callbacks') .then(callDefault) diff --git a/app/assets/javascripts/pages/sessions/index.js b/app/assets/javascripts/pages/sessions/index.js index 54f4e56359a..c2c069d1ca8 100644 --- a/app/assets/javascripts/pages/sessions/index.js +++ b/app/assets/javascripts/pages/sessions/index.js @@ -1,5 +1,3 @@ import initU2F from '../../shared/sessions/u2f'; -export default () => { - initU2F(); -}; +document.addEventListener('DOMContentLoaded', initU2F); -- cgit v1.2.1 From 2d01877631979ed809871053cce450a5af31750b Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 02:19:58 -0600 Subject: migrate omniauth_callbacks:* to static bundle --- app/assets/javascripts/dispatcher.js | 5 ----- app/assets/javascripts/pages/omniauth_callbacks/index.js | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index cba4509b20b..0e7645636f7 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -277,11 +277,6 @@ var Dispatcher; break; } switch (path[0]) { - case 'omniauth_callbacks': - import('./pages/omniauth_callbacks') - .then(callDefault) - .catch(fail); - break; case 'admin': import('./pages/admin') .then(callDefault) diff --git a/app/assets/javascripts/pages/omniauth_callbacks/index.js b/app/assets/javascripts/pages/omniauth_callbacks/index.js index 54f4e56359a..c2c069d1ca8 100644 --- a/app/assets/javascripts/pages/omniauth_callbacks/index.js +++ b/app/assets/javascripts/pages/omniauth_callbacks/index.js @@ -1,5 +1,3 @@ import initU2F from '../../shared/sessions/u2f'; -export default () => { - initU2F(); -}; +document.addEventListener('DOMContentLoaded', initU2F); -- cgit v1.2.1 From 58acacd6805bd3cb2faa3208fe5c4b7a69afeaa7 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 02:22:46 -0600 Subject: migrate admin:* to static bundle --- app/assets/javascripts/dispatcher.js | 3 --- app/assets/javascripts/pages/admin/index.js | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 0e7645636f7..2bb173dc0ef 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -278,9 +278,6 @@ var Dispatcher; } switch (path[0]) { case 'admin': - import('./pages/admin') - .then(callDefault) - .catch(fail); switch (path[1]) { case 'broadcast_messages': import('./pages/admin/broadcast_messages') diff --git a/app/assets/javascripts/pages/admin/index.js b/app/assets/javascripts/pages/admin/index.js index 8b843037d85..e50b61f09e2 100644 --- a/app/assets/javascripts/pages/admin/index.js +++ b/app/assets/javascripts/pages/admin/index.js @@ -1,3 +1,3 @@ import initAdmin from './admin'; -export default () => initAdmin(); +document.addEventListener('DOMContentLoaded', initAdmin); -- cgit v1.2.1 From ba5ae88aad87fd6728dad4f84a044980c3aa4e5f Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 20 Feb 2018 23:58:50 -0600 Subject: use DOMContentLoaded event over jQuery .ready to ensure execution order --- app/assets/javascripts/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 65e751dd460..dc9e5bb03f4 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -61,7 +61,7 @@ gl.lazyLoader = new LazyLoader({ observerNode: '#content-body', }); -$(() => { +document.addEventListener('DOMContentLoaded', () => { const $body = $('body'); const $document = $(document); const $window = $(window); -- cgit v1.2.1