From 5af52cf9dfe8d75341fb5c6e82b44f205a29cc93 Mon Sep 17 00:00:00 2001
From: REJack <info@rejack.de>
Date: Thu, 19 Sep 2019 13:34:26 +0200
Subject: [PATCH] removed screenCollapseSize option for PushMenu and removed
 isShown()

---
 build/js/PushMenu.js          | 43 ++++++++++++++++-------------------
 build/scss/_main-sidebar.scss | 13 -----------
 docs/javascript/push-menu.md  |  1 -
 3 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/build/js/PushMenu.js b/build/js/PushMenu.js
index 6f2b15ce0..f6016b079 100644
--- a/build/js/PushMenu.js
+++ b/build/js/PushMenu.js
@@ -23,7 +23,6 @@ const PushMenu = (($) => {
 
   const Default = {
     autoCollapseSize: false,
-    screenCollapseSize: 768,
     enableRemember: false,
     noTransitionAfterReload: true
   }
@@ -40,8 +39,7 @@ const PushMenu = (($) => {
   const ClassName = {
     SIDEBAR_OPEN: 'sidebar-open',
     COLLAPSED: 'sidebar-collapse',
-    OPEN: 'sidebar-open',
-    SIDEBAR_MINI: 'sidebar-mini'
+    OPEN: 'sidebar-open'
   }
 
   /**
@@ -54,11 +52,16 @@ const PushMenu = (($) => {
       this._element = element
       this._options = $.extend({}, Default, options)
 
-      this._init()
+
+      if (!$(Selector.BODY).hasClass(ClassName.COLLAPSED) && !$(Selector.BODY).hasClass(ClassName.OPEN)) {
+        $(Selector.BODY).addClass(ClassName.OPEN)
+      }
 
       if (!$(Selector.OVERLAY).length) {
         this._addOverlay()
       }
+
+      this._init()
     }
 
     // Public
@@ -67,7 +70,7 @@ const PushMenu = (($) => {
       $(Selector.BODY).addClass(ClassName.OPEN).removeClass(ClassName.COLLAPSED)
 
       if(this._options.enableRemember) {
-          localStorage.setItem(`remember${EVENT_KEY}`, ClassName.OPEN);
+          localStorage.setItem(`remember${EVENT_KEY}`, ClassName.OPEN)
       }
 
       const shownEvent = $.Event(Event.SHOWN)
@@ -78,23 +81,15 @@ const PushMenu = (($) => {
       $(Selector.BODY).removeClass(ClassName.OPEN).addClass(ClassName.COLLAPSED)
 
       if(this._options.enableRemember) {
-          localStorage.setItem(`remember${EVENT_KEY}`, ClassName.COLLAPSED);
+          localStorage.setItem(`remember${EVENT_KEY}`, ClassName.COLLAPSED)
       }
 
       const collapsedEvent = $.Event(Event.COLLAPSED)
       $(this._element).trigger(collapsedEvent)
     }
 
-    isShown() {
-      if ($(window).width() >= this._options.screenCollapseSize) {
-        return !$(Selector.BODY).hasClass(ClassName.COLLAPSED)
-      } else {
-        return $(Selector.BODY).hasClass(ClassName.OPEN)
-      }
-    }
-
     toggle() {
-      if (this.isShown()) {
+      if ($(Selector.BODY).hasClass(ClassName.OPEN)) {
         this.collapse()
       } else {
         this.show()
@@ -104,11 +99,11 @@ const PushMenu = (($) => {
     autoCollapse() {
       if (this._options.autoCollapseSize) {
         if ($(window).width() <= this._options.autoCollapseSize) {
-          if (this.isShown()) {
+          if ($(Selector.BODY).hasClass(ClassName.OPEN)) {
             this.toggle()
           }
         } else {
-          if (!this.isShown()) {
+          if (!$(Selector.BODY).hasClass(ClassName.OPEN)) {
             this.toggle()
           }
         }
@@ -117,24 +112,24 @@ const PushMenu = (($) => {
 
     remember() {
       if(this._options.enableRemember) {
-        var toggleState = localStorage.getItem(`remember${EVENT_KEY}`);
+        let toggleState = localStorage.getItem(`remember${EVENT_KEY}`)
         if (toggleState == ClassName.COLLAPSED){
           if (this._options.noTransitionAfterReload) {
               $("body").addClass('hold-transition').addClass(ClassName.COLLAPSED).delay(50).queue(function() {
-                $(this).removeClass('hold-transition');
+                $(this).removeClass('hold-transition')
                 $(this).dequeue()
-              });
+              })
           } else {
-            $("body").addClass(ClassName.COLLAPSED);
+            $("body").addClass(ClassName.COLLAPSED)
           }
         } else {
           if (this._options.noTransitionAfterReload) {
             $("body").addClass('hold-transition').removeClass(ClassName.COLLAPSED).delay(50).queue(function() {
-              $(this).removeClass('hold-transition');
+              $(this).removeClass('hold-transition')
               $(this).dequeue()
-            });
+            })
           } else {
-            $("body").removeClass(ClassName.COLLAPSED);
+            $("body").removeClass(ClassName.COLLAPSED)
           }
         }
       }
diff --git a/build/scss/_main-sidebar.scss b/build/scss/_main-sidebar.scss
index f66e3b811..1d222a2da 100644
--- a/build/scss/_main-sidebar.scss
+++ b/build/scss/_main-sidebar.scss
@@ -176,19 +176,6 @@
   z-index: $zindex-main-sidebar - 1;
 }
 
-.sidebar-mini-md {
-  &.sidebar-open {
-    #sidebar-overlay {
-      @include media-breakpoint-up(sm) {
-        display: none;
-      }
-      @include media-breakpoint-down(sm) {
-        display: block;
-      }
-    }
-  }
-}
-
 [class*='sidebar-light-'] {
   // Sidebar background color
   background-color: $sidebar-light-bg;
diff --git a/docs/javascript/push-menu.md b/docs/javascript/push-menu.md
index 7e3d65650..104862ad9 100644
--- a/docs/javascript/push-menu.md
+++ b/docs/javascript/push-menu.md
@@ -28,7 +28,6 @@ $('.sidebar-toggle-btn').PushMenu(options)
 | Name | Type | Default | Description
 |-|-|-|-
 |autoCollapseSize | Boolean/Number | FALSE | Screen width in pixels to trigger auto collapse sidebar
-|screenCollapseSize | Number | 768 | Screen width in pixels for small screens.
 |enableRemember | Boolean | FALSE | Remember sidebar state and set after page refresh.
 |noTransitionAfterReload | Boolean | TRUE | Hold Transition after page refresh.
 {: .table .table-bordered .bg-light}