Browse Source

Merge pull request #1102 from byted/fix/issue_1101-auto-hide_not_working_after_reload

Fix issue #1101: reloading breaks auto-hide layout
Jasper van Merle 6 years ago
parent
commit
f0723ca0e1
2 changed files with 4 additions and 1 deletions
  1. 3 0
      assets/javascripts/app/router.coffee
  2. 1 1
      assets/javascripts/app/settings.coffee

+ 3 - 0
assets/javascripts/app/router.coffee

@@ -124,6 +124,9 @@ class app.Router
   isIndex: ->
     @context?.path is '/' or (app.isSingleDoc() and @context?.entry?.isIndex())
 
+  isSettings: ->
+    @context?.path is '/settings'
+
   setInitialPath: ->
     # Remove superfluous forward slashes at the beginning of the path
     if (path = location.pathname.replace /^\/{2,}/g, '/') isnt location.pathname

+ 1 - 1
assets/javascripts/app/settings.coffee

@@ -129,7 +129,7 @@ class app.Settings
 
   toggleLayout: (layout, enable) ->
     classList = document.body.classList
-    classList.toggle(layout, enable) unless layout is '_sidebar-hidden'
+    classList.toggle(layout, enable) unless app.router?.isSettings
     classList.toggle('_overlay-scrollbars', $.overlayScrollbarsEnabled())
     return