From 95b1141b9df7b8de3fdb893454326daf752d7f66 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 16 Nov 2023 04:35:45 +0000
Subject: [PATCH] fix: include anchor when normalizing urls for spa/popovers
---
quartz/components/scripts/popover.inline.ts | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index 9506ec4..2bd21d1 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -2,14 +2,18 @@
// from micromorph/src/utils.ts
// https://github.com/natemoo-re/micromorph/blob/main/src/utils.ts#L5
-export function normalizeRelativeURLs(el: Element | Document, base: string | URL) {
- const update = (el: Element, attr: string, base: string | URL) => {
- el.setAttribute(attr, new URL(el.getAttribute(attr)!, base).pathname)
+export function normalizeRelativeURLs(el: Element | Document, destination: string | URL) {
+ const rebase = (el: Element, attr: string, newBase: string | URL) => {
+ const rebased = new URL(el.getAttribute(attr)!, newBase)
+ el.setAttribute(attr, rebased.pathname + rebased.hash)
}
- el.querySelectorAll('[href^="./"], [href^="../"]').forEach((item) => update(item, "href", base))
-
- el.querySelectorAll('[src^="./"], [src^="../"]').forEach((item) => update(item, "src", base))
+ el.querySelectorAll('[href^="./"], [href^="../"]').forEach((item) =>
+ rebase(item, "href", destination),
+ )
+ el.querySelectorAll('[src^="./"], [src^="../"]').forEach((item) =>
+ rebase(item, "src", destination),
+ )
}
const p = new DOMParser()
--
Gitblit v1.10.0