some cleanup

1 files changed, 8 insertions, 6 deletions

diff --git a/server/src/routes/ui/style/transition.js b/server/src/routes/ui/style/transition.js
index 6a4477e..c125c42 100644
--- a/server/src/routes/ui/style/transition.js
+++ b/server/src/routes/ui/style/transition.js
@@ -10,8 +10,9 @@ globalThis.addEventListener("load", () => {
     patch_page()
 })
 
-globalThis.addEventListener("popstate", () => {
-    transition_to(window.location.href)
+globalThis.addEventListener("popstate", (_e) => {
+    transition_to(window.location.href, true)
+    // transition_to(_e.state.href, true)
 })
 
 function patch_page() {
@@ -23,13 +24,13 @@ function patch_page() {
     })
 }
 
-async function transition_to(href) {
-    const trigger_load = prepare_load(href)
+async function transition_to(href, back) {
+    const trigger_load = prepare_load(href, back)
     await fade(false)
     trigger_load()
 }
 
-function prepare_load(href) {
+function prepare_load(href, back) {
     const r_promise = fetch(href)
     return async () => {
         let rt = ""
@@ -44,7 +45,8 @@ function prepare_load(href) {
         document.head.innerHTML = head
         document.body.outerHTML = body
         fade(true)
-        window.history.pushState({}, "", href)
+        // if (!back) window.history.pushState({href}, "", href)
+        if (!back) window.history.pushState({}, "", href)
         patch_page()
     }
 }