From 082fdf2e8098ef6bcb46a7dfabf8c6b9fd096346 Mon Sep 17 00:00:00 2001
From: Jeremy Press <jeremypress1@gmail.com>
Date: Mon, 28 Aug 2023 03:57:19 +0000
Subject: [PATCH] Fix typo :) (#430)
---
quartz/components/scripts/spa.inline.ts | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index 0a57a9d..bd22608 100644
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -12,9 +12,6 @@
try {
const url = new URL(href)
if (window.location.origin === url.origin) {
- if (url.pathname === window.location.pathname) {
- return !url.hash
- }
return true
}
} catch (e) {}
@@ -66,9 +63,8 @@
// scroll into place and add history
if (!isBack) {
- history.pushState({}, "", url)
if (url.hash) {
- const el = document.getElementById(url.hash.substring(1))
+ const el = document.getElementById(decodeURIComponent(url.hash.substring(1)))
el?.scrollIntoView()
} else {
window.scrollTo({ top: 0 })
@@ -81,6 +77,11 @@
const elementsToAdd = html.head.querySelectorAll(":not([spa-preserve])")
elementsToAdd.forEach((el) => document.head.appendChild(el))
+ // delay setting the url until now
+ // at this point everything is loaded so changing the url should resolve to the correct addresses
+ if (!isBack) {
+ history.pushState({}, "", url)
+ }
notifyNav(getFullSlug(window))
delete announcer.dataset.persist
}
--
Gitblit v1.10.0