pull/1452/merge
Abdullah Almsaeed 2017-06-25 09:13:29 -04:00
parent 41d3db21ed
commit 4b0d73bab9
3 changed files with 13 additions and 13 deletions

View File

@ -84,7 +84,7 @@
parent.addClass(ClassName.open) parent.addClass(ClassName.open)
tree.slideDown(this.options.animationSpeed, function () { tree.slideDown(this.options.animationSpeed, function () {
$(this.element).trigger(expandedEvent) $(this.element).trigger(expandedEvent)
}) }.bind(this))
} }
Tree.prototype.collapse = function (tree, parentLi) { Tree.prototype.collapse = function (tree, parentLi) {
@ -95,7 +95,7 @@
tree.slideUp(this.options.animationSpeed, function () { tree.slideUp(this.options.animationSpeed, function () {
tree.find(Selector.open + ' > ' + Selector.treeview).slideUp() tree.find(Selector.open + ' > ' + Selector.treeview).slideUp()
$(this.element).trigger(collapsedEvent) $(this.element).trigger(collapsedEvent)
}) }.bind(this))
} }
// Private // Private

12
dist/js/adminlte.js vendored
View File

@ -106,20 +106,20 @@ throw new Error('AdminLTE requires jQuery')
if ($('body').hasClass(ClassName.fixed)) { if ($('body').hasClass(ClassName.fixed)) {
$(Selector.contentWrapper).css('min-height', windowHeight - footerHeight) $(Selector.contentWrapper).css('min-height', windowHeight - footerHeight)
} else { } else {
var postSetWidth var postSetHeight
if (windowHeight >= sidebarHeight) { if (windowHeight >= sidebarHeight) {
$(Selector.contentWrapper).css('min-height', windowHeight - neg) $(Selector.contentWrapper).css('min-height', windowHeight - neg)
postSetWidth = windowHeight - neg postSetHeight = windowHeight - neg
} else { } else {
$(Selector.contentWrapper).css('min-height', sidebarHeight) $(Selector.contentWrapper).css('min-height', sidebarHeight)
postSetWidth = sidebarHeight postSetHeight = sidebarHeight
} }
// Fix for the control sidebar height // Fix for the control sidebar height
var $controlSidebar = $(Selector.controlSidebar) var $controlSidebar = $(Selector.controlSidebar)
if (typeof $controlSidebar !== 'undefined') { if (typeof $controlSidebar !== 'undefined') {
if ($controlSidebar.height() > postSetWidth) if ($controlSidebar.height() > postSetHeight)
$(Selector.contentWrapper).css('min-height', $controlSidebar.height()) $(Selector.contentWrapper).css('min-height', $controlSidebar.height())
} }
} }
@ -455,7 +455,7 @@ throw new Error('AdminLTE requires jQuery')
parent.addClass(ClassName.open) parent.addClass(ClassName.open)
tree.slideDown(this.options.animationSpeed, function () { tree.slideDown(this.options.animationSpeed, function () {
$(this.element).trigger(expandedEvent) $(this.element).trigger(expandedEvent)
}) }.bind(this))
} }
Tree.prototype.collapse = function (tree, parentLi) { Tree.prototype.collapse = function (tree, parentLi) {
@ -466,7 +466,7 @@ throw new Error('AdminLTE requires jQuery')
tree.slideUp(this.options.animationSpeed, function () { tree.slideUp(this.options.animationSpeed, function () {
tree.find(Selector.open + ' > ' + Selector.treeview).slideUp() tree.find(Selector.open + ' > ' + Selector.treeview).slideUp()
$(this.element).trigger(collapsedEvent) $(this.element).trigger(collapsedEvent)
}) }.bind(this))
} }
// Private // Private

File diff suppressed because one or more lines are too long