generalize transitions

2 files changed, 3 insertions, 6 deletions

diff --git a/web/script/jshelper b/web/script/jshelper
-Subproject bd8b233316820cd35178085ef132f82279be050
+Subproject 2d36b0762459b8edfc1529827d0c15447edd266
diff --git a/web/script/transition.ts b/web/script/transition.ts
index 2bf2a7b..00ed9a7 100644
--- a/web/script/transition.ts
+++ b/web/script/transition.ts
@@ -8,14 +8,12 @@
 import { e } from "./jshelper/src/element.ts";
 
 const duration = 200
-globalThis.addEventListener("load", () => {
+globalThis.addEventListener("DOMContentLoaded", () => {
     patch_page()
 })
 
 globalThis.addEventListener("popstate", async (_e) => {
-    const had_disable_transition = disable_transition;
     await transition_to(window.location.href, true)
-    if (had_disable_transition) window.location.reload()
 })
 
 let disable_transition = false
@@ -26,7 +24,6 @@ globalThis.addEventListener("navigationrequiresreload", () => {
 function patch_page() {
     document.querySelectorAll("a").forEach(el => {
         el.addEventListener("click", async ev => {
-            if (disable_transition) return
             ev.preventDefault()
             await transition_to(el.href)
         })
@@ -34,10 +31,12 @@ function patch_page() {
 }
 
 async function transition_to(href: string, back?: boolean) {
+    if (disable_transition) return window.location.href = href
     const trigger_load = prepare_load(href, back)
     await fade(false)
     trigger_load()
     disable_transition = false;
+    await fade(true)
 }
 
 function show_error(mesg: string) {
@@ -61,8 +60,6 @@ function prepare_load(href: string, back?: boolean) {
         document.head.innerHTML = head
         document.body.outerHTML = body
         globalThis.dispatchEvent(new Event("DOMContentLoaded"))
-        fade(true)
-        patch_page()
     }
 }