fixed autocallapse on mobile touchscroll & rebuild dists (#2324)

build/js/PushMenu.js

@@ -52,11 +52,6 @@ const PushMenu = (($) => {
       this._element = element
       this._options = $.extend({}, Default, options)
 
-
-      if (!$(Selector.BODY).hasClass(ClassName.COLLAPSED) && !$(Selector.BODY).hasClass(ClassName.OPEN)) {
-        $(Selector.BODY).addClass(ClassName.OPEN)
-      }
-
       if (!$(Selector.OVERLAY).length) {
         this._addOverlay()
       }
@@ -67,7 +62,13 @@ const PushMenu = (($) => {
     // Public
 
     show() {
-      $(Selector.BODY).addClass(ClassName.OPEN).removeClass(ClassName.COLLAPSED)
+      if (this._options.autoCollapseSize) {
+        if ($(window).width() <= this._options.autoCollapseSize) {
+          $(Selector.BODY).addClass(ClassName.OPEN)
+        }
+      }
+
+      $(Selector.BODY).removeClass(ClassName.COLLAPSED)
 
       if(this._options.enableRemember) {
           localStorage.setItem(`remember${EVENT_KEY}`, ClassName.OPEN)
@@ -78,7 +79,13 @@ const PushMenu = (($) => {
     }
 
     collapse() {
-      $(Selector.BODY).removeClass(ClassName.OPEN).addClass(ClassName.COLLAPSED)
+      if (this._options.autoCollapseSize) {
+        if ($(window).width() <= this._options.autoCollapseSize) {
+          $(Selector.BODY).removeClass(ClassName.OPEN)
+        }
+      }
+
+      $(Selector.BODY).addClass(ClassName.COLLAPSED)
 
       if(this._options.enableRemember) {
           localStorage.setItem(`remember${EVENT_KEY}`, ClassName.COLLAPSED)
@@ -89,7 +96,7 @@ const PushMenu = (($) => {
     }
 
     toggle() {
-      if ($(Selector.BODY).hasClass(ClassName.OPEN)) {
+      if (!$(Selector.BODY).hasClass(ClassName.COLLAPSED  )) {
         this.collapse()
       } else {
         this.show()
@@ -99,12 +106,14 @@ const PushMenu = (($) => {
     autoCollapse() {
       if (this._options.autoCollapseSize) {
         if ($(window).width() <= this._options.autoCollapseSize) {
-          if ($(Selector.BODY).hasClass(ClassName.OPEN)) {
+          if (!$(Selector.BODY).hasClass(ClassName.OPEN)) {
-            this.toggle()
+            this.collapse()
           }
         } else {
           if (!$(Selector.BODY).hasClass(ClassName.OPEN)) {
-            this.toggle()
+            this.show()
+          } else {
+            $(Selector.BODY).removeClass(ClassName.OPEN)
           }
         }
       }

dist/css/adminlte.css

@@ -22884,7 +22884,6 @@ html.maximized-card {
 
 .select2-container--default .select2-selection--single .select2-selection__rendered {
   padding-left: 0;
-  padding-right: 0;
   height: auto;
   margin-top: -3px;
 }

dist/js/adminlte.js

@@ -344,9 +344,11 @@
 
         var max = this._max(heights);
 
-        $(Selector.CONTENT).css('min-height', max - heights.footer);
+        $(Selector.CONTENT).css('min-height', max - heights.header);
 
         if ($('body').hasClass(ClassName.LAYOUT_FIXED)) {
+          $(Selector.CONTENT).css('min-height', max - heights.header - heights.footer);
+
           if (typeof $.fn.overlayScrollbars !== 'undefined') {
             $(Selector.SIDEBAR).overlayScrollbars({
               className: this._config.scrollbarTheme,
@@ -494,10 +496,6 @@
         this._element = element;
         this._options = $.extend({}, Default, options);
 
-        if (!$(Selector.BODY).hasClass(ClassName.COLLAPSED) && !$(Selector.BODY).hasClass(ClassName.OPEN)) {
-          $(Selector.BODY).addClass(ClassName.OPEN);
-        }
-
         if (!$(Selector.OVERLAY).length) {
           this._addOverlay();
         }
@@ -509,7 +507,13 @@
       var _proto = PushMenu.prototype;
 
       _proto.show = function show() {
-        $(Selector.BODY).addClass(ClassName.OPEN).removeClass(ClassName.COLLAPSED);
+        if (this._options.autoCollapseSize) {
+          if ($(window).width() <= this._options.autoCollapseSize) {
+            $(Selector.BODY).addClass(ClassName.OPEN);
+          }
+        }
+
+        $(Selector.BODY).removeClass(ClassName.COLLAPSED);
 
         if (this._options.enableRemember) {
           localStorage.setItem("remember" + EVENT_KEY, ClassName.OPEN);
@@ -520,7 +524,13 @@
       };
 
       _proto.collapse = function collapse() {
-        $(Selector.BODY).removeClass(ClassName.OPEN).addClass(ClassName.COLLAPSED);
+        if (this._options.autoCollapseSize) {
+          if ($(window).width() <= this._options.autoCollapseSize) {
+            $(Selector.BODY).removeClass(ClassName.OPEN);
+          }
+        }
+
+        $(Selector.BODY).addClass(ClassName.COLLAPSED);
 
         if (this._options.enableRemember) {
           localStorage.setItem("remember" + EVENT_KEY, ClassName.COLLAPSED);
@@ -531,7 +541,7 @@
       };
 
       _proto.toggle = function toggle() {
-        if ($(Selector.BODY).hasClass(ClassName.OPEN)) {
+        if (!$(Selector.BODY).hasClass(ClassName.COLLAPSED)) {
           this.collapse();
         } else {
           this.show();
@@ -541,12 +551,14 @@
       _proto.autoCollapse = function autoCollapse() {
         if (this._options.autoCollapseSize) {
           if ($(window).width() <= this._options.autoCollapseSize) {
-            if ($(Selector.BODY).hasClass(ClassName.OPEN)) {
+            if (!$(Selector.BODY).hasClass(ClassName.OPEN)) {
-              this.toggle();
+              this.collapse();
             }
           } else {
             if (!$(Selector.BODY).hasClass(ClassName.OPEN)) {
-              this.toggle();
+              this.show();
+            } else {
+              $(Selector.BODY).removeClass(ClassName.OPEN);
             }
           }
         }