From e10f6da01140f483162fe33cc77b2255b0683ac7 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 18 Aug 2023 04:08:26 +0000
Subject: [PATCH] format
---
quartz/components/scripts/spa.inline.ts | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index c28da28..e0a8373 100644
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -17,7 +17,7 @@
}
return true
}
- } catch (e) { }
+ } catch (e) {}
return false
}
@@ -46,10 +46,6 @@
})
if (!contents) return
- if (!isBack) {
- history.pushState({}, "", url)
- window.scrollTo({ top: 0 })
- }
const html = p.parseFromString(contents, "text/html")
let title = html.querySelector("title")?.textContent
@@ -65,8 +61,20 @@
announcer.dataset.persist = ""
html.body.appendChild(announcer)
+ // morph body
micromorph(document.body, html.body)
+ // scroll into place and add history
+ if (!isBack) {
+ history.pushState({}, "", url)
+ if (url.hash) {
+ const el = document.getElementById(url.hash.substring(1))
+ el?.scrollIntoView()
+ } else {
+ window.scrollTo({ top: 0 })
+ }
+ }
+
// now, patch head
const elementsToRemove = document.head.querySelectorAll(":not([spa-preserve])")
elementsToRemove.forEach((el) => el.remove())
@@ -92,8 +100,9 @@
}
})
- window.addEventListener("popstate", () => {
- if (window.location.hash) return
+ window.addEventListener("popstate", (event) => {
+ const { url } = getOpts(event) ?? {}
+ if (window.location.hash && window.location.pathname === url?.pathname) return
try {
navigate(new URL(window.location.toString()), true)
} catch (e) {
--
Gitblit v1.10.0