Return early.

pull/2751/head
XhmikosR 2020-05-31 16:45:54 +03:00
parent 3528b6c1f8
commit 187a01a8ee
3 changed files with 111 additions and 101 deletions

View File

@ -134,6 +134,10 @@ const ControlSidebar = ($ => {
} }
_fixScrollHeight() { _fixScrollHeight() {
if (!$('body').hasClass(ClassName.LAYOUT_FIXED)) {
return
}
const heights = { const heights = {
scroll: $(document).height(), scroll: $(document).height(),
window: $(window).height(), window: $(window).height(),
@ -148,7 +152,6 @@ const ControlSidebar = ($ => {
let navbarFixed = false let navbarFixed = false
let footerFixed = false let footerFixed = false
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
if ( if (
$('body').hasClass(ClassName.NAVBAR_FIXED) || $('body').hasClass(ClassName.NAVBAR_FIXED) ||
$('body').hasClass(ClassName.NAVBAR_SM_FIXED) || $('body').hasClass(ClassName.NAVBAR_SM_FIXED) ||
@ -198,16 +201,18 @@ const ControlSidebar = ($ => {
$(Selector.CONTROL_SIDEBAR).css('top', heights.header) $(Selector.CONTROL_SIDEBAR).css('top', heights.header)
} }
} }
}
_fixHeight() { _fixHeight() {
if (!$('body').hasClass(ClassName.LAYOUT_FIXED)) {
return
}
const heights = { const heights = {
window: $(window).height(), window: $(window).height(),
header: $(Selector.HEADER).outerHeight(), header: $(Selector.HEADER).outerHeight(),
footer: $(Selector.FOOTER).outerHeight() footer: $(Selector.FOOTER).outerHeight()
} }
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
let sidebarHeight = heights.window - heights.header let sidebarHeight = heights.window - heights.header
if ( if (
@ -235,7 +240,6 @@ const ControlSidebar = ($ => {
}) })
} }
} }
}
// Static // Static

View File

@ -93,7 +93,10 @@ const Layout = ($ => {
} }
} }
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) { if (!$('body').hasClass(ClassName.LAYOUT_FIXED)) {
return
}
if (offset !== false) { if (offset !== false) {
$(Selector.CONTENT).css('min-height', (max + offset) - heights.header - heights.footer) $(Selector.CONTENT).css('min-height', (max + offset) - heights.header - heights.footer)
} }
@ -109,7 +112,6 @@ const Layout = ($ => {
}) })
} }
} }
}
fixLoginRegisterHeight() { fixLoginRegisterHeight() {
if ($(Selector.LOGIN_BOX + ', ' + Selector.REGISTER_BOX).length === 0) { if ($(Selector.LOGIN_BOX + ', ' + Selector.REGISTER_BOX).length === 0) {

View File

@ -102,7 +102,10 @@ const PushMenu = ($ => {
} }
autoCollapse(resize = false) { autoCollapse(resize = false) {
if (this._options.autoCollapseSize) { if (!this._options.autoCollapseSize) {
return
}
if ($(window).width() <= this._options.autoCollapseSize) { if ($(window).width() <= this._options.autoCollapseSize) {
if (!$(Selector.BODY).hasClass(ClassName.OPEN)) { if (!$(Selector.BODY).hasClass(ClassName.OPEN)) {
this.collapse() this.collapse()
@ -115,10 +118,12 @@ const PushMenu = ($ => {
} }
} }
} }
}
remember() { remember() {
if (this._options.enableRemember) { if (!this._options.enableRemember) {
return
}
const toggleState = localStorage.getItem(`remember${EVENT_KEY}`) const toggleState = localStorage.getItem(`remember${EVENT_KEY}`)
if (toggleState === ClassName.COLLAPSED) { if (toggleState === ClassName.COLLAPSED) {
if (this._options.noTransitionAfterReload) { if (this._options.noTransitionAfterReload) {
@ -138,7 +143,6 @@ const PushMenu = ($ => {
$('body').removeClass(ClassName.COLLAPSED) $('body').removeClass(ClassName.COLLAPSED)
} }
} }
}
// Private // Private