From a99c9b7959ccaa4741f4bf4ce49aaf96a1970c22 Mon Sep 17 00:00:00 2001
From: REJack <info@rejack.de>
Date: Thu, 5 Sep 2019 08:15:35 +0200
Subject: [PATCH] fixed sidebar state remember to work in both ways

---
 build/js/Layout.js   |  3 ---
 build/js/PushMenu.js | 13 +++++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/js/Layout.js b/build/js/Layout.js
index 09e4ced4b..bfd67c051 100644
--- a/build/js/Layout.js
+++ b/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)
diff --git a/build/js/PushMenu.js b/build/js/PushMenu.js
index ceb1c1ea3..6f2b15ce0 100644
--- a/build/js/PushMenu.js
+++ b/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);
           }
         }
       }