diff options
author | Phil Hughes <me@iamphill.com> | 2017-09-01 10:41:31 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-09-06 16:54:17 +0300 |
commit | c56100b3ec26a0f5d71bb80f94c661674b3226b8 (patch) | |
tree | 37a6d9d31b278550cc6b6d948ad5629db9dffc17 /app/assets/javascripts/fly_out_nav.js | |
parent | 5d2b7aa200e0ce5a66672259d468be4ccc5f9124 (diff) |
Add top level items to fly-out navigation
This only appears when in the collapsed sidebar. If the sidebar is expanded, then these items are hidden & no fly-out navigation is displayed.
Closes #36294
Diffstat (limited to 'app/assets/javascripts/fly_out_nav.js')
-rw-r--r-- | app/assets/javascripts/fly_out_nav.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/fly_out_nav.js b/app/assets/javascripts/fly_out_nav.js index 063155a167a..4b19f7b4188 100644 --- a/app/assets/javascripts/fly_out_nav.js +++ b/app/assets/javascripts/fly_out_nav.js @@ -21,8 +21,10 @@ let headerHeight = 50; export const getHeaderHeight = () => headerHeight; +export const isSidebarCollapsed = () => sidebar && sidebar.classList.contains('sidebar-icons-only'); + export const canShowActiveSubItems = (el) => { - if (el.classList.contains('active') && (sidebar && !sidebar.classList.contains('sidebar-icons-only'))) { + if (el.classList.contains('active') && !isSidebarCollapsed()) { return false; } @@ -100,12 +102,13 @@ export const moveSubItemsToPosition = (el, subItems) => { export const showSubLevelItems = (el) => { const subItems = el.querySelector('.sidebar-sub-level-items'); + const isIconOnly = subItems && subItems.classList.contains('is-fly-out-only'); if (!canShowSubItems() || !canShowActiveSubItems(el)) return; el.classList.add(IS_OVER_CLASS); - if (!subItems) return; + if (!subItems || (!isSidebarCollapsed() && isIconOnly)) return; subItems.style.display = 'block'; el.classList.add(IS_SHOWING_FLY_OUT_CLASS); |