From 296c1cf83f587706d23ffc2f14962628d0534953 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 19 Nov 2023 02:46:58 +0000
Subject: [PATCH] fix: spa shouldn't use popover script directly
---
quartz/util/path.ts | 16 ++++++++++++++++
quartz/components/scripts/popover.inline.ts | 17 +----------------
quartz/components/scripts/spa.inline.ts | 4 +---
3 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index 2bd21d1..371563b 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -1,20 +1,5 @@
import { computePosition, flip, inline, shift } from "@floating-ui/dom"
-
-// from micromorph/src/utils.ts
-// https://github.com/natemoo-re/micromorph/blob/main/src/utils.ts#L5
-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) =>
- rebase(item, "href", destination),
- )
- el.querySelectorAll('[src^="./"], [src^="../"]').forEach((item) =>
- rebase(item, "src", destination),
- )
-}
+import { normalizeRelativeURLs } from "../../util/path"
const p = new DOMParser()
async function mouseEnterHandler(
diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index 29cc334..c2a44c9 100644
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -1,10 +1,8 @@
import micromorph from "micromorph"
-import { FullSlug, RelativeURL, getFullSlug } from "../../util/path"
-import { normalizeRelativeURLs } from "./popover.inline"
+import { FullSlug, RelativeURL, getFullSlug, normalizeRelativeURLs } from "../../util/path"
// adapted from `micromorph`
// https://github.com/natemoo-re/micromorph
-
const NODE_TYPE_ELEMENT = 1
let announcer = document.createElement("route-announcer")
const isElement = (target: EventTarget | null): target is Element =>
diff --git a/quartz/util/path.ts b/quartz/util/path.ts
index 173eb2e..e450339 100644
--- a/quartz/util/path.ts
+++ b/quartz/util/path.ts
@@ -84,6 +84,22 @@
return res
}
+// from micromorph/src/utils.ts
+// https://github.com/natemoo-re/micromorph/blob/main/src/utils.ts#L5
+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) =>
+ rebase(item, "href", destination),
+ )
+ el.querySelectorAll('[src^="./"], [src^="../"]').forEach((item) =>
+ rebase(item, "src", destination),
+ )
+}
+
// resolve /a/b/c to ../..
export function pathToRoot(slug: FullSlug): RelativeURL {
let rootPath = slug
--
Gitblit v1.10.0