From d0f67d993507219cfa0824db8a3e59286f0ebf09 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 21 Aug 2023 01:41:37 +0000
Subject: [PATCH] move wss server start after http

---
 quartz/components/scripts/spa.inline.ts |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/quartz/components/scripts/spa.inline.ts b/quartz/components/scripts/spa.inline.ts
index 0a57a9d..6f9399e 100644
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -12,9 +12,6 @@
   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) {}
@@ -66,7 +63,6 @@
 
   // scroll into place and add history
   if (!isBack) {
-    history.pushState({}, "", url)
     if (url.hash) {
       const el = document.getElementById(url.hash.substring(1))
       el?.scrollIntoView()
@@ -81,6 +77,9 @@
   const elementsToAdd = html.head.querySelectorAll(":not([spa-preserve])")
   elementsToAdd.forEach((el) => document.head.appendChild(el))
 
+  // delay setting the url until now
+  // at this point everything is loaded so changing the url should resolve to the correct addresses
+  history.pushState({}, "", url)
   notifyNav(getFullSlug(window))
   delete announcer.dataset.persist
 }

--
Gitblit v1.10.0