From 0a1338086a16d078e4d734e6444a550b798ebffc Mon Sep 17 00:00:00 2001
From: REJack <info@rejack.de>
Date: Tue, 3 Sep 2019 12:36:55 +0200
Subject: [PATCH] fixed content-height calculation
---
build/js/Layout.js | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/build/js/Layout.js b/build/js/Layout.js
index eced4ff1e..09e4ced4b 100644
--- a/build/js/Layout.js
+++ b/build/js/Layout.js
@@ -65,18 +65,18 @@ const Layout = (($) => {
fixLayoutHeight() {
const heights = {
- window : $(window).height(),
- header : $(Selector.HEADER).outerHeight(),
- footer : $(Selector.FOOTER).outerHeight(),
- sidebar : $(Selector.SIDEBAR).height(),
+ window: $(window).height(),
+ header: $(Selector.HEADER).length !== 0 ? $(Selector.HEADER).outerHeight() : 0,
+ footer: $(Selector.FOOTER).length !== 0 ? $(Selector.FOOTER).outerHeight() : 0,
+ sidebar: $(Selector.SIDEBAR).length !== 0 ? $(Selector.SIDEBAR).height() : 0,
}
const max = this._max(heights)
-
+ console.log(heights);
+ $(Selector.CONTENT).css('min-height', max - heights.footer)
+
if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
- $(Selector.CONTENT).css('min-height', max - heights.header - heights.footer)
- // $(Selector.SIDEBAR).css('min-height', max - heights.header)
if (typeof $.fn.overlayScrollbars !== 'undefined') {
$(Selector.SIDEBAR).overlayScrollbars({
@@ -88,12 +88,6 @@ const Layout = (($) => {
}
})
}
- } else {
- if (heights.window > heights.sidebar) {
- $(Selector.CONTENT).css('min-height', heights.window - heights.header - heights.footer)
- } else {
- $(Selector.CONTENT).css('min-height', heights.sidebar - heights.header)
- }
}
}