Preserve path when reloading the app

Fixes #849.

Thibaut Courouble committed 8 years ago

Commit a8a97e01 parent f562c2f3 files · +14 −3Browse files

Unified · Split

3 files

     new app.views.Updates()
     @updateChecker = new app.UpdateChecker()
+  reboot: ->
+    if location.pathname isnt '/'
+      window.location = "/##{location.pathname}"
+    else
+      window.location = '/'
+    return
   reload: ->
     @docs.clearCache()
     @disabledDocs.clearCache()
-    if @appCache then @appCache.reload() else window.location = '/'
+    if @appCache then @appCache.reload() else @reboot()
     return
   reset: ->

     return
   reload: ->
-    $.on @cache, 'updateready noupdate error', -> window.location = '/'
+    $.on @cache, 'updateready noupdate error', ->
+      if location.pathname isnt '/'
+        window.location = "/##{location.pathname}"
+      else
+        window.location = '/'
     @notifyUpdate = false
     @notifyProgress = true
     try @cache.update() catch

@@ -77,7 +77,7 @@ class app.views.Document extends app.View · 76 unmodified lines
77	switch target.getAttribute('data-behavior')	77	switch target.getAttribute('data-behavior')
78	when 'back' then history.back()	78	when 'back' then history.back()
79	when 'reload' then window.location.reload()	79	when 'reload' then window.location.reload()
80	when 'reboot' then window.location = '/'	80	when 'reboot' then app.reboot()
81	when 'hard-reload' then app.reload()	81	when 'hard-reload' then app.reload()
82	when 'reset' then app.reset() if confirm('Are you sure you want to reset DevDocs?')	82	when 'reset' then app.reset() if confirm('Are you sure you want to reset DevDocs?')
83	return	83	return

Keyboard shortcuts