mirror of https://github.com/ColorlibHQ/AdminLTE
Return early.
parent
3528b6c1f8
commit
187a01a8ee
|
@ -134,6 +134,10 @@ const ControlSidebar = ($ => {
|
|||
}
|
||||
|
||||
_fixScrollHeight() {
|
||||
if (!$('body').hasClass(ClassName.LAYOUT_FIXED)) {
|
||||
return
|
||||
}
|
||||
|
||||
const heights = {
|
||||
scroll: $(document).height(),
|
||||
window: $(window).height(),
|
||||
|
@ -148,7 +152,6 @@ const ControlSidebar = ($ => {
|
|||
let navbarFixed = false
|
||||
let footerFixed = false
|
||||
|
||||
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
|
||||
if (
|
||||
$('body').hasClass(ClassName.NAVBAR_FIXED) ||
|
||||
$('body').hasClass(ClassName.NAVBAR_SM_FIXED) ||
|
||||
|
@ -198,16 +201,18 @@ const ControlSidebar = ($ => {
|
|||
$(Selector.CONTROL_SIDEBAR).css('top', heights.header)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_fixHeight() {
|
||||
if (!$('body').hasClass(ClassName.LAYOUT_FIXED)) {
|
||||
return
|
||||
}
|
||||
|
||||
const heights = {
|
||||
window: $(window).height(),
|
||||
header: $(Selector.HEADER).outerHeight(),
|
||||
footer: $(Selector.FOOTER).outerHeight()
|
||||
}
|
||||
|
||||
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
|
||||
let sidebarHeight = heights.window - heights.header
|
||||
|
||||
if (
|
||||
|
@ -235,7 +240,6 @@ const ControlSidebar = ($ => {
|
|||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Static
|
||||
|
||||
|
|
|
@ -93,7 +93,10 @@ const Layout = ($ => {
|
|||
}
|
||||
}
|
||||
|
||||
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
|
||||
if (!$('body').hasClass(ClassName.LAYOUT_FIXED)) {
|
||||
return
|
||||
}
|
||||
|
||||
if (offset !== false) {
|
||||
$(Selector.CONTENT).css('min-height', (max + offset) - heights.header - heights.footer)
|
||||
}
|
||||
|
@ -109,7 +112,6 @@ const Layout = ($ => {
|
|||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fixLoginRegisterHeight() {
|
||||
if ($(Selector.LOGIN_BOX + ', ' + Selector.REGISTER_BOX).length === 0) {
|
||||
|
|
|
@ -102,7 +102,10 @@ const PushMenu = ($ => {
|
|||
}
|
||||
|
||||
autoCollapse(resize = false) {
|
||||
if (this._options.autoCollapseSize) {
|
||||
if (!this._options.autoCollapseSize) {
|
||||
return
|
||||
}
|
||||
|
||||
if ($(window).width() <= this._options.autoCollapseSize) {
|
||||
if (!$(Selector.BODY).hasClass(ClassName.OPEN)) {
|
||||
this.collapse()
|
||||
|
@ -115,10 +118,12 @@ const PushMenu = ($ => {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
remember() {
|
||||
if (this._options.enableRemember) {
|
||||
if (!this._options.enableRemember) {
|
||||
return
|
||||
}
|
||||
|
||||
const toggleState = localStorage.getItem(`remember${EVENT_KEY}`)
|
||||
if (toggleState === ClassName.COLLAPSED) {
|
||||
if (this._options.noTransitionAfterReload) {
|
||||
|
@ -138,7 +143,6 @@ const PushMenu = ($ => {
|
|||
$('body').removeClass(ClassName.COLLAPSED)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Private
|
||||
|
||||
|
|
Loading…
Reference in New Issue