From fe2e16d937e2b57fb2bb1d10dea47db7256a4a49 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 24 Mar 2025 01:08:07 +0000
Subject: [PATCH] fix: disallow user-select in popover
---
quartz/components/scripts/popover.inline.ts | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/quartz/components/scripts/popover.inline.ts b/quartz/components/scripts/popover.inline.ts
index dee0a78..7337793 100644
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -1,9 +1,10 @@
import { computePosition, flip, inline, shift } from "@floating-ui/dom"
import { normalizeRelativeURLs } from "../../util/path"
+import { fetchCanonical } from "./util"
const p = new DOMParser()
async function mouseEnterHandler(
- this: HTMLLinkElement,
+ this: HTMLAnchorElement,
{ clientX, clientY }: { clientX: number; clientY: number },
) {
const link = this
@@ -33,11 +34,11 @@
thisUrl.hash = ""
thisUrl.search = ""
const targetUrl = new URL(link.href)
- const hash = targetUrl.hash
+ const hash = decodeURIComponent(targetUrl.hash)
targetUrl.hash = ""
targetUrl.search = ""
- const response = await fetch(`${targetUrl}`).catch((err) => {
+ const response = await fetchCanonical(targetUrl).catch((err) => {
console.error(err)
})
@@ -61,10 +62,7 @@
switch (contentTypeCategory) {
case "image":
const img = document.createElement("img")
-
- response.blob().then((blob) => {
- img.src = URL.createObjectURL(blob)
- })
+ img.src = targetUrl.toString()
img.alt = targetUrl.pathname
popoverInner.appendChild(img)
@@ -84,6 +82,8 @@
const contents = await response.text()
const html = p.parseFromString(contents, "text/html")
normalizeRelativeURLs(html, targetUrl)
+ // strip all IDs from elements to prevent duplicates
+ html.querySelectorAll("[id]").forEach((el) => el.removeAttribute("id"))
const elts = [...html.getElementsByClassName("popover-hint")]
if (elts.length === 0) return
@@ -103,7 +103,7 @@
}
document.addEventListener("nav", () => {
- const links = [...document.getElementsByClassName("internal")] as HTMLLinkElement[]
+ const links = [...document.getElementsByClassName("internal")] as HTMLAnchorElement[]
for (const link of links) {
link.addEventListener("mouseenter", mouseEnterHandler)
window.addCleanup(() => link.removeEventListener("mouseenter", mouseEnterHandler))
--
Gitblit v1.10.0