fixed fixLayoutHeight on pushmenu collapse/expand event & removed auto expand sidebar on resize

build/js/Layout.js

@@ -31,6 +31,7 @@ const Layout = (($) => {
     CONTROL_SIDEBAR: '.control-sidebar',
     LAYOUT_FIXED   : '.layout-fixed',
     FOOTER         : '.main-footer',
+    PUSHMENU_BTN   : '[data-widget="pushmenu"]',
     LOGIN_BOX      : '.login-box',
     REGISTER_BOX   : '.register-box'
   }
@@ -105,7 +106,12 @@ const Layout = (($) => {
       // Activate layout height watcher
       this.fixLayoutHeight()
       $(Selector.SIDEBAR)
-        .on('collapsed.lte.treeview expanded.lte.treeview collapsed.lte.pushmenu expanded.lte.pushmenu', () => {
+        .on('collapsed.lte.treeview expanded.lte.treeview', () => {
+          this.fixLayoutHeight()
+        })
+
+      $(Selector.PUSHMENU_BTN)
+        .on('collapsed.lte.pushmenu shown.lte.pushmenu', () => {
           this.fixLayoutHeight()
         })
 

build/js/PushMenu.js

@@ -110,9 +110,7 @@ const PushMenu = (($) => {
             this.collapse()
           }
         } else if (resize == true) {
-          if (!$(Selector.BODY).hasClass(ClassName.OPEN)) {
-            this.show()
-          } else {
+          if ($(Selector.BODY).hasClass(ClassName.OPEN)) {
             $(Selector.BODY).removeClass(ClassName.OPEN)
           }
         }

dist/js/adminlte.js

@@ -298,6 +298,7 @@
       CONTROL_SIDEBAR: '.control-sidebar',
       LAYOUT_FIXED: '.layout-fixed',
       FOOTER: '.main-footer',
+      PUSHMENU_BTN: '[data-widget="pushmenu"]',
       LOGIN_BOX: '.login-box',
       REGISTER_BOX: '.register-box'
     };
@@ -372,7 +373,10 @@
 
         // Activate layout height watcher
         this.fixLayoutHeight();
-        $(Selector.SIDEBAR).on('collapsed.lte.treeview expanded.lte.treeview collapsed.lte.pushmenu expanded.lte.pushmenu', function () {
+        $(Selector.SIDEBAR).on('collapsed.lte.treeview expanded.lte.treeview', function () {
+          _this.fixLayoutHeight();
+        });
+        $(Selector.PUSHMENU_BTN).on('collapsed.lte.pushmenu shown.lte.pushmenu', function () {
           _this.fixLayoutHeight();
         });
         $(window).resize(function () {
@@ -563,9 +567,7 @@
               this.collapse();
             }
           } else if (resize == true) {
-            if (!$(Selector.BODY).hasClass(ClassName.OPEN)) {
-              this.show();
-            } else {
+            if ($(Selector.BODY).hasClass(ClassName.OPEN)) {
               $(Selector.BODY).removeClass(ClassName.OPEN);
             }
           }