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

Fix layout height computation

pull/1707/head
Abdullah Almsaeed 2016-10-15 13:18:29 -04:00
parent 945211f777
commit 71c560ec27
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/js/dist/Layout.js vendored
View File

@ -64,10 +64,10 @@ var Layout = function ($) {
_createClass(Layout, [{
key: 'fixLayoutHeight',
value: function fixLayoutHeight() {
var heights = [$(window).height(), $(Selector.HEADER).outerHeight(), $(Selector.FOOTER).outerHeight()];
var heights = [$(window).height(), $(Selector.HEADER).outerHeight(), $(Selector.FOOTER).outerHeight(), $(Selector.SIDEBAR).height()],
max = this._max(heights);
$(Selector.CONTENT).css('min-height', heights[0] - (heights[1] + heights[2]));
console.log(heights[0] - (heights[1] + heights[2]));
$(Selector.CONTENT).css('min-height', max - (heights[1] + heights[2]));
}
// Private
@ -80,7 +80,7 @@ var Layout = function ($) {
$('body').removeClass(ClassName.HOLD);
this.fixLayoutHeight();
$(Selector.SIDEBAR).on('collapsed.lte.treeview expanded.lte.treeview', function () {
$(Selector.SIDEBAR).on('collapsed.lte.treeview expanded.lte.treeview collapsed.lte.pushmenu expanded.lte.pushmenu', function () {
_this.fixLayoutHeight();
});
$(window).resize(function () {

2
build/js/dist/Layout.js.map vendored
View File

File diff suppressed because one or more lines are too long

23
build/js/src/Layout.js
View File

@ -13,9 +13,9 @@ const Layout = (($) => {
* ====================================================
*/
const NAME = 'Layout'
const DATA_KEY = 'lte.layout'
const EVENT_KEY = `.${DATA_KEY}`
const NAME = 'Layout'
const DATA_KEY = 'lte.layout'
const EVENT_KEY = `.${DATA_KEY}`
const JQUERY_NO_CONFLICT = $.fn[NAME]
const Event = {
@ -56,13 +56,14 @@ const Layout = (($) => {
fixLayoutHeight() {
let heights = [
$(window).height(),
$(Selector.HEADER).outerHeight(),
$(Selector.FOOTER).outerHeight()
]
$(window).height(),
$(Selector.HEADER).outerHeight(),
$(Selector.FOOTER).outerHeight(),
$(Selector.SIDEBAR).height()
],
max = this._max(heights)
$(Selector.CONTENT).css('min-height', heights[0] - (heights[1] + heights[2]))
console.log(heights[0] - (heights[1] + heights[2]))
$(Selector.CONTENT).css('min-height', max - (heights[1] + heights[2]))
}
// Private
@ -71,7 +72,7 @@ const Layout = (($) => {
$('body').removeClass(ClassName.HOLD)
this.fixLayoutHeight()
$(Selector.SIDEBAR).on('collapsed.lte.treeview expanded.lte.treeview', () => {
$(Selector.SIDEBAR).on('collapsed.lte.treeview expanded.lte.treeview collapsed.lte.pushmenu expanded.lte.pushmenu', () => {
this.fixLayoutHeight()
})
$(window).resize(() => {
@ -116,7 +117,7 @@ const Layout = (($) => {
$.fn[NAME] = Layout._jQueryInterface
$.fn[NAME].Constructor = Layout
$.fn[NAME].noConflict = function () {
$.fn[NAME].noConflict = function () {
$.fn[NAME] = JQUERY_NO_CONFLICT
return Layout._jQueryInterface
}