From 952d6cb3dd63bb50056198c1d7782314f8976bbf Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Sun, 20 Aug 2023 18:08:44 -0700 Subject: [PATCH] fix: nav event with spa off, anchor nav refresh page --- quartz/components/scripts/spa.inline.ts | 4 ---- quartz/plugins/emitters/componentResources.ts | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts index 32c2bf2b..6f9399ea 100644 --- a/quartz/components/scripts/spa.inline.ts +++ b/quartz/components/scripts/spa.inline.ts @@ -12,9 +12,6 @@ const isLocalUrl = (href: string) => { 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) {} @@ -94,7 +91,6 @@ function createRouter() { window.addEventListener("click", async (event) => { const { url } = getOpts(event) ?? {} if (!url) return - if (url.pathname === window.location.pathname) return event.preventDefault() try { navigate(url, false) diff --git a/quartz/plugins/emitters/componentResources.ts b/quartz/plugins/emitters/componentResources.ts index e0bc83de..a62bc382 100644 --- a/quartz/plugins/emitters/componentResources.ts +++ b/quartz/plugins/emitters/componentResources.ts @@ -103,7 +103,7 @@ function addGlobalPageResources( } else { componentResources.afterDOMLoaded.push(` window.spaNavigate = (url, _) => window.location.assign(url) - const event = new CustomEvent("nav", { detail: { slug: document.body.dataset.slug } }) + const event = new CustomEvent("nav", { detail: { url: document.body.dataset.slug } }) document.dispatchEvent(event)`) }