From aa7d9a0bb7c7767e03ed339e81f721a0835b2706 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Wed, 10 Jan 2018 11:46:03 -0600 Subject: [PATCH 1/3] Refactor dispatcher sessions path --- app/assets/javascripts/dispatcher.js | 9 +++------ app/assets/javascripts/pages/sessions/new/index.js | 11 +++++++++++ .../{ => pages/sessions/new}/oauth_remember_me.js | 0 .../{ => pages/sessions/new}/signin_tabs_memoizer.js | 0 .../{ => pages/sessions/new}/username_validator.js | 0 5 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 app/assets/javascripts/pages/sessions/new/index.js rename app/assets/javascripts/{ => pages/sessions/new}/oauth_remember_me.js (100%) rename app/assets/javascripts/{ => pages/sessions/new}/signin_tabs_memoizer.js (100%) rename app/assets/javascripts/{ => pages/sessions/new}/username_validator.js (100%) diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index a282b67b0fc..b970b41618e 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -53,17 +53,14 @@ import UsersSelect from './users_select'; import RefSelectDropdown from './ref_select_dropdown'; import GfmAutoComplete from './gfm_auto_complete'; import ShortcutsBlob from './shortcuts_blob'; -import SigninTabsMemoizer from './signin_tabs_memoizer'; 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'; import initNotes from './init_notes'; @@ -161,9 +158,9 @@ import Activities from './activities'; initExperimentalFlags(); break; case 'sessions:new': - new UsernameValidator(); - new SigninTabsMemoizer(); - new OAuthRememberMe({ container: $(".omniauth-container") }).bindEvents(); + import('./pages/sessions/new') + .then(callDefault) + .catch(fail); break; case 'projects:boards:show': case 'projects:boards:index': diff --git a/app/assets/javascripts/pages/sessions/new/index.js b/app/assets/javascripts/pages/sessions/new/index.js new file mode 100644 index 00000000000..f163557babc --- /dev/null +++ b/app/assets/javascripts/pages/sessions/new/index.js @@ -0,0 +1,11 @@ +import UsernameValidator from './username_validator'; +import SigninTabsMemoizer from './signin_tabs_memoizer'; +import OAuthRememberMe from './oauth_remember_me'; + +export default () => { + new UsernameValidator(); // eslint-disable-line no-new + new SigninTabsMemoizer(); // eslint-disable-line no-new + new OAuthRememberMe({ // eslint-disable-line no-new + container: $('.omniauth-container'), + }).bindEvents(); +}; diff --git a/app/assets/javascripts/oauth_remember_me.js b/app/assets/javascripts/pages/sessions/new/oauth_remember_me.js similarity index 100% rename from app/assets/javascripts/oauth_remember_me.js rename to app/assets/javascripts/pages/sessions/new/oauth_remember_me.js diff --git a/app/assets/javascripts/signin_tabs_memoizer.js b/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js similarity index 100% rename from app/assets/javascripts/signin_tabs_memoizer.js rename to app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js diff --git a/app/assets/javascripts/username_validator.js b/app/assets/javascripts/pages/sessions/new/username_validator.js similarity index 100% rename from app/assets/javascripts/username_validator.js rename to app/assets/javascripts/pages/sessions/new/username_validator.js From dc9baaa0689c006322f0f411d04ee77963201f33 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Wed, 10 Jan 2018 12:02:28 -0600 Subject: [PATCH 2/3] Fix import --- .../javascripts/pages/sessions/new/signin_tabs_memoizer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js b/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js index 20255398047..f99573e5c74 100644 --- a/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js +++ b/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js @@ -1,6 +1,6 @@ /* eslint no-param-reassign: ["error", { "props": false }]*/ /* eslint no-new: "off" */ -import AccessorUtilities from './lib/utils/accessor'; +import AccessorUtilities from '~/lib/utils/accessor'; /** * Memorize the last selected tab after reloading a page. From ea77456df36850385270c49fb3bbb0fb4764596e Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Wed, 10 Jan 2018 12:56:15 -0600 Subject: [PATCH 3/3] Fix specs --- spec/javascripts/oauth_remember_me_spec.js | 2 +- spec/javascripts/signin_tabs_memoizer_spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/javascripts/oauth_remember_me_spec.js b/spec/javascripts/oauth_remember_me_spec.js index f90e0093d25..b24563f738b 100644 --- a/spec/javascripts/oauth_remember_me_spec.js +++ b/spec/javascripts/oauth_remember_me_spec.js @@ -1,4 +1,4 @@ -import OAuthRememberMe from '~/oauth_remember_me'; +import OAuthRememberMe from '~/pages/sessions/new/oauth_remember_me'; describe('OAuthRememberMe', () => { preloadFixtures('static/oauth_remember_me.html.raw'); diff --git a/spec/javascripts/signin_tabs_memoizer_spec.js b/spec/javascripts/signin_tabs_memoizer_spec.js index a53e8a94d89..c4f500788b2 100644 --- a/spec/javascripts/signin_tabs_memoizer_spec.js +++ b/spec/javascripts/signin_tabs_memoizer_spec.js @@ -1,5 +1,5 @@ import AccessorUtilities from '~/lib/utils/accessor'; -import SigninTabsMemoizer from '~/signin_tabs_memoizer'; +import SigninTabsMemoizer from '~/pages/sessions/new/signin_tabs_memoizer'; (() => { describe('SigninTabsMemoizer', () => {