Quellcode durchsuchen

fixed sidebar state remember to work in both ways

REJack vor 5 Jahren
Ursprung
Commit
a99c9b7959
2 geänderte Dateien mit 11 neuen und 5 gelöschten Zeilen
  1. 0 3
      build/js/Layout.js
  2. 11 2
      build/js/PushMenu.js

+ 0 - 3
build/js/Layout.js

@@ -94,9 +94,6 @@ const Layout = (($) => {
     // Private
 
     _init() {
-      // Enable transitions
-      $('body').removeClass(ClassName.HOLD)
-
       // Activate layout height watcher
       this.fixLayoutHeight()
       $(Selector.SIDEBAR)

+ 11 - 2
build/js/PushMenu.js

@@ -120,12 +120,21 @@ const PushMenu = (($) => {
         var toggleState = localStorage.getItem(`remember${EVENT_KEY}`);
         if (toggleState == ClassName.COLLAPSED){
           if (this._options.noTransitionAfterReload) {
-            $("body").addClass('hold-transition').addClass(ClassName.COLLAPSED).delay(10).queue(function() {
+              $("body").addClass('hold-transition').addClass(ClassName.COLLAPSED).delay(50).queue(function() {
+                $(this).removeClass('hold-transition');
+                $(this).dequeue()
+              });
+          } else {
+            $("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).dequeue()
             });
           } else {
-            $("body").addClass(ClassName.COLLAPSED);
+            $("body").removeClass(ClassName.COLLAPSED);
           }
         }
       }