diff options
Diffstat (limited to 'app/assets/javascripts/pages/groups')
-rw-r--r-- | app/assets/javascripts/pages/groups/clusters/index.js (renamed from app/assets/javascripts/pages/groups/index.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/pages/groups/edit/index.js | 7 | ||||
-rw-r--r-- | app/assets/javascripts/pages/groups/new/index.js | 7 | ||||
-rw-r--r-- | app/assets/javascripts/pages/groups/shared/group_details.js | 3 |
4 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/javascripts/pages/groups/index.js b/app/assets/javascripts/pages/groups/clusters/index.js index 4d04c37caa7..4d04c37caa7 100644 --- a/app/assets/javascripts/pages/groups/index.js +++ b/app/assets/javascripts/pages/groups/clusters/index.js diff --git a/app/assets/javascripts/pages/groups/edit/index.js b/app/assets/javascripts/pages/groups/edit/index.js index f32392c9e29..33e552cd1ba 100644 --- a/app/assets/javascripts/pages/groups/edit/index.js +++ b/app/assets/javascripts/pages/groups/edit/index.js @@ -1,4 +1,4 @@ -import initAvatarPicker from '~/avatar_picker'; +import initFilePickers from '~/file_pickers'; import TransferDropdown from '~/groups/transfer_dropdown'; import initConfirmDangerModal from '~/confirm_danger_modal'; import initSettingsPanels from '~/settings_panels'; @@ -10,8 +10,7 @@ import groupsSelect from '~/groups_select'; import projectSelect from '~/project_select'; document.addEventListener('DOMContentLoaded', () => { - initAvatarPicker(); - new TransferDropdown(); // eslint-disable-line no-new + initFilePickers(); initConfirmDangerModal(); initSettingsPanels(); dirtySubmitFactory( @@ -24,4 +23,6 @@ document.addEventListener('DOMContentLoaded', () => { groupsSelect(); projectSelect(); + + return new TransferDropdown(); }); diff --git a/app/assets/javascripts/pages/groups/new/index.js b/app/assets/javascripts/pages/groups/new/index.js index 0710fefe70c..640e64b5d3e 100644 --- a/app/assets/javascripts/pages/groups/new/index.js +++ b/app/assets/javascripts/pages/groups/new/index.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import BindInOut from '~/behaviors/bind_in_out'; import Group from '~/group'; -import initAvatarPicker from '~/avatar_picker'; import GroupPathValidator from './group_path_validator'; +import initFilePickers from '~/file_pickers'; document.addEventListener('DOMContentLoaded', () => { const parentId = $('#group_parent_id'); @@ -10,6 +10,7 @@ document.addEventListener('DOMContentLoaded', () => { new GroupPathValidator(); // eslint-disable-line no-new } BindInOut.initAll(); - new Group(); // eslint-disable-line no-new - initAvatarPicker(); + initFilePickers(); + + return new Group(); }); diff --git a/app/assets/javascripts/pages/groups/shared/group_details.js b/app/assets/javascripts/pages/groups/shared/group_details.js index 37b253d7c48..85daff3f60f 100644 --- a/app/assets/javascripts/pages/groups/shared/group_details.js +++ b/app/assets/javascripts/pages/groups/shared/group_details.js @@ -8,6 +8,7 @@ import NotificationsForm from '~/notifications_form'; import ProjectsList from '~/projects_list'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import GroupTabs from './group_tabs'; +import initNamespaceStorageLimitAlert from '~/namespace_storage_limit_alert'; export default function initGroupDetails(actionName = 'show') { const newGroupChildWrapper = document.querySelector('.js-new-project-subgroup'); @@ -27,4 +28,6 @@ export default function initGroupDetails(actionName = 'show') { if (newGroupChildWrapper) { new NewGroupChild(newGroupChildWrapper); } + + initNamespaceStorageLimitAlert(); } |