From 9b47279fe62bfd8921bb4f98c3008feff2d9fe34 Mon Sep 17 00:00:00 2001
From: Jon Erling Hustadnes <jonerling.hustadnes@gmail.com>
Date: Thu, 27 Feb 2025 21:33:15 +0000
Subject: [PATCH] feat(i18n): added nb-NO (Norwegian) (#1795)
---
quartz/components/scripts/spa.inline.ts | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index 115bc96..df48f04 100644
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -1,9 +1,9 @@
import micromorph from "micromorph"
-import { FullSlug, RelativeURL, getFullSlug } from "../../util/path"
+import { FullSlug, RelativeURL, getFullSlug, normalizeRelativeURLs } from "../../util/path"
+import { fetchCanonical } from "./util"
// 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 =>
@@ -40,18 +40,48 @@
document.dispatchEvent(event)
}
+const cleanupFns: Set<(...args: any[]) => void> = new Set()
+window.addCleanup = (fn) => cleanupFns.add(fn)
+
+function startLoading() {
+ const loadingBar = document.createElement("div")
+ loadingBar.className = "navigation-progress"
+ loadingBar.style.width = "0"
+ if (!document.body.contains(loadingBar)) {
+ document.body.appendChild(loadingBar)
+ }
+
+ setTimeout(() => {
+ loadingBar.style.width = "80%"
+ }, 100)
+}
+
let p: DOMParser
async function navigate(url: URL, isBack: boolean = false) {
+ startLoading()
p = p || new DOMParser()
- const contents = await fetch(`${url}`)
- .then((res) => res.text())
+ const contents = await fetchCanonical(url)
+ .then((res) => {
+ const contentType = res.headers.get("content-type")
+ if (contentType?.startsWith("text/html")) {
+ return res.text()
+ } else {
+ window.location.assign(url)
+ }
+ })
.catch(() => {
window.location.assign(url)
})
if (!contents) return
+ // cleanup old
+ cleanupFns.forEach((fn) => fn())
+ cleanupFns.clear()
+
const html = p.parseFromString(contents, "text/html")
+ normalizeRelativeURLs(html, url)
+
let title = html.querySelector("title")?.textContent
if (title) {
document.title = title
@@ -89,6 +119,7 @@
if (!isBack) {
history.pushState({}, "", url)
}
+
notifyNav(getFullSlug(window))
delete announcer.dataset.persist
}
@@ -106,6 +137,7 @@
if (isSamePage(url) && url.hash) {
const el = document.getElementById(decodeURIComponent(url.hash.substring(1)))
el?.scrollIntoView()
+ history.pushState({}, "", url)
return
}
@@ -154,6 +186,7 @@
style:
"position: absolute; left: 0; top: 0; clip: rect(0 0 0 0); clip-path: inset(50%); overflow: hidden; white-space: nowrap; width: 1px; height: 1px",
}
+
customElements.define(
"route-announcer",
class RouteAnnouncer extends HTMLElement {
--
Gitblit v1.10.0