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

Fixed an issue where height becomes NaN when there is no main-header (#1847)

pull/1900/merge
OKAZAKI EITARO 2018-07-15 06:39:38 +09:00 committed by Abdullah Almsaeed
parent 2de87c8ab8
commit 1339932caa
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/js/Layout.js
View File

@ -84,8 +84,9 @@
$(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden'); $(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
// Get window height and the wrapper height // Get window height and the wrapper height
var footerHeight = $(Selector.mainFooter).outerHeight() || 0; var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
var neg = $(Selector.mainHeader).outerHeight() + footerHeight; var headerHeight = $(Selector.mainHeader).outerHeight() || 0;
var neg = headerHeight + footerHeight;
var windowHeight = $(window).height(); var windowHeight = $(window).height();
var sidebarHeight = $(Selector.sidebar).height() || 0; var sidebarHeight = $(Selector.sidebar).height() || 0;