github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5015 from burdittw/v4-dev-check-for-sidebar 

Issue 5011- Add checks for if sidebar exists to stop errors on pages with no sidebar
pull/5026/head
Daniel 2023-04-02 11:54:32 +05:30 committed by GitHub
parent ec3d689ea1 5d2ebcec02
commit c8869e768b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/html/components/_scripts.astro
View File

@ -21,16 +21,18 @@ const distPath = (path != undefined) ? path : '../../../dist'
const SELECTOR_SIDEBAR_WRAPPER = '.sidebar-wrapper'
const Default = {
scrollbarTheme: 'os-theme-light',
scrollbarAutoHide: 'leave'
scrollbarAutoHide: 'leave',
scrollbarClickScroll: true
}
document.addEventListener("DOMContentLoaded", function() {
if (typeof OverlayScrollbarsGlobal?.OverlayScrollbars !== 'undefined') {
OverlayScrollbarsGlobal.OverlayScrollbars(document.querySelector(SELECTOR_SIDEBAR_WRAPPER), {
const sidebarWrapper = document.querySelector(SELECTOR_SIDEBAR_WRAPPER)
if (sidebarWrapper && typeof OverlayScrollbarsGlobal?.OverlayScrollbars !== 'undefined') {
OverlayScrollbarsGlobal.OverlayScrollbars(sidebarWrapper, {
scrollbars: {
theme: Default.scrollbarTheme,
autoHide: Default.scrollbarAutoHide,
clickScroll: true
clickScroll: Default.scrollbarClickScroll
}
})
}

7
src/ts/push-menu.ts
View File

@ -29,6 +29,7 @@ const CLASS_NAME_SIDEBAR_EXPAND = 'sidebar-expand'
const CLASS_NAME_SIDEBAR_OVERLAY = 'sidebar-overlay'
const CLASS_NAME_MENU_OPEN = 'menu-open'
const SELECTOR_APP_SIDEBAR = '.app-sidebar'
const SELECTOR_SIDEBAR_WRAPPER = '.sidebar-wrapper'
const SELECTOR_SIDEBAR_MENU = '.sidebar-menu'
const SELECTOR_NAV_ITEM = '.nav-item'
@ -151,12 +152,16 @@ class PushMenu {
*/
domReady(() => {
const data = new PushMenu(document.body, Defaults)
const sidebar = document?.querySelector(SELECTOR_APP_SIDEBAR) as HTMLElement | undefined
if (sidebar) {
const data = new PushMenu(sidebar, Defaults)
data.init()
window.addEventListener('resize', () => {
data.init()
})
}
const sidebarOverlay = document.createElement('div')
sidebarOverlay.className = CLASS_NAME_SIDEBAR_OVERLAY