From 5d58766fdca12fc1db0d99a3807d89f2f229ea68 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Tue, 9 Jan 2018 18:36:10 +0100 Subject: Refactored profile:* and help:* imports in dispatcher --- app/assets/javascripts/dispatcher.js | 17 +++++++++++------ app/assets/javascripts/pages/help/index.js | 3 +++ app/assets/javascripts/pages/profiles/index/index.js | 7 +++++++ .../pages/profiles/personal_access_tokens/index.js | 3 +++ .../javascripts/pages/profiles/preferences/index.js | 3 +++ 5 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 app/assets/javascripts/pages/help/index.js create mode 100644 app/assets/javascripts/pages/profiles/index/index.js create mode 100644 app/assets/javascripts/pages/profiles/personal_access_tokens/index.js create mode 100644 app/assets/javascripts/pages/profiles/preferences/index.js diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 9e8b2acfe1b..40c4a563db9 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -59,11 +59,9 @@ import Star from './star'; import TreeView from './tree'; import UsagePing from './usage_ping'; import UsernameValidator from './username_validator'; -import VersionCheckImage from './version_check_image'; import Wikis from './wikis'; import ZenMode from './zen_mode'; import initSettingsPanels from './settings_panels'; -import initExperimentalFlags from './experimental_flags'; import OAuthRememberMe from './oauth_remember_me'; import PerformanceBar from './performance_bar'; import initBroadcastMessagesForm from './broadcast_message'; @@ -159,7 +157,9 @@ import Activities from './activities'; switch (page) { case 'profiles:preferences:show': - initExperimentalFlags(); + import('./pages/profiles/preferences') + .then(callDefault) + .catch(fail); break; case 'sessions:new': new UsernameValidator(); @@ -512,7 +512,7 @@ import Activities from './activities'; new BlobViewer(); break; case 'help:index': - VersionCheckImage.bindErrorEvent($('img.js-version-status-badge')); + import('./pages/help').then(module => module.default()).catch(fail); break; case 'search:show': new Search(); @@ -557,6 +557,10 @@ import Activities from './activities'; new UsersSelect(); break; case 'profiles:personal_access_tokens:index': + import('./pages/profiles/personal_access_tokens') + .then(callDefault) + .catch(fail); + break; case 'admin:impersonation_tokens:index': new DueDateSelectors(); break; @@ -623,8 +627,9 @@ import Activities from './activities'; new UserCallout(); break; case 'profiles': - new NotificationsForm(); - notificationsDropdown(); + import('./pages/profiles/index/') + .then(callDefault) + .catch(fail); break; case 'projects': new Project(); diff --git a/app/assets/javascripts/pages/help/index.js b/app/assets/javascripts/pages/help/index.js new file mode 100644 index 00000000000..4cf8afc4b7e --- /dev/null +++ b/app/assets/javascripts/pages/help/index.js @@ -0,0 +1,3 @@ +import VersionCheckImage from '../../version_check_image'; + +export default () => VersionCheckImage.bindErrorEvent($('img.js-version-status-badge')); diff --git a/app/assets/javascripts/pages/profiles/index/index.js b/app/assets/javascripts/pages/profiles/index/index.js new file mode 100644 index 00000000000..90eed38777a --- /dev/null +++ b/app/assets/javascripts/pages/profiles/index/index.js @@ -0,0 +1,7 @@ +import NotificationsForm from '../../../notifications_form'; +import notificationsDropdown from '../../../notifications_dropdown'; + +export default () => { + new NotificationsForm(); // eslint-disable-line no-new + notificationsDropdown(); +}; diff --git a/app/assets/javascripts/pages/profiles/personal_access_tokens/index.js b/app/assets/javascripts/pages/profiles/personal_access_tokens/index.js new file mode 100644 index 00000000000..030328a1363 --- /dev/null +++ b/app/assets/javascripts/pages/profiles/personal_access_tokens/index.js @@ -0,0 +1,3 @@ +import DueDateSelectors from '../../../due_date_select'; + +export default () => new DueDateSelectors(); diff --git a/app/assets/javascripts/pages/profiles/preferences/index.js b/app/assets/javascripts/pages/profiles/preferences/index.js new file mode 100644 index 00000000000..bc399bb7138 --- /dev/null +++ b/app/assets/javascripts/pages/profiles/preferences/index.js @@ -0,0 +1,3 @@ +import initExperimentalFlags from '../../../experimental_flags'; + +export default () => initExperimentalFlags(); -- cgit v1.2.1 From 7d0a1285a10fcb4735c20e21d83367159402a06d Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Thu, 11 Jan 2018 12:21:19 +0100 Subject: Removed experimental feature flag unsed depenecy for profiles/preferences --- app/assets/javascripts/dispatcher.js | 9 +++------ app/assets/javascripts/pages/profiles/preferences/index.js | 3 --- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 app/assets/javascripts/pages/profiles/preferences/index.js diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 40c4a563db9..206f5bfaa6e 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -156,11 +156,6 @@ import Activities from './activities'; const filteredSearchEnabled = gl.FilteredSearchManager && document.querySelector('.filtered-search'); switch (page) { - case 'profiles:preferences:show': - import('./pages/profiles/preferences') - .then(callDefault) - .catch(fail); - break; case 'sessions:new': new UsernameValidator(); new SigninTabsMemoizer(); @@ -512,7 +507,9 @@ import Activities from './activities'; new BlobViewer(); break; case 'help:index': - import('./pages/help').then(module => module.default()).catch(fail); + import('./pages/help') + .then(callDefault) + .catch(fail); break; case 'search:show': new Search(); diff --git a/app/assets/javascripts/pages/profiles/preferences/index.js b/app/assets/javascripts/pages/profiles/preferences/index.js deleted file mode 100644 index bc399bb7138..00000000000 --- a/app/assets/javascripts/pages/profiles/preferences/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import initExperimentalFlags from '../../../experimental_flags'; - -export default () => initExperimentalFlags(); -- cgit v1.2.1