From 364aee36fc8891c48ab2bd20c396ce321cd7a0a6 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 05 May 2022 05:03:09 +0000
Subject: [PATCH] fix: merge conf
---
assets/js/router.js | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/assets/js/router.js b/assets/js/router.js
index 5c874ee..81c25ac 100644
--- a/assets/js/router.js
+++ b/assets/js/router.js
@@ -1,25 +1,12 @@
-import { router, navigate } from "https://unpkg.com/million/dist/router.mjs"
+import { router, navigate } from "https://unpkg.com/million@1.8.9-0/dist/router.mjs"
-export const init = (loader) => {
+export const attachSPARouting = (draw) => {
// SPA navigation for access later
window.navigate = navigate
// We only mutate document.title and content within .singlePage element
router(".singlePage")
// We need on initial load, then subsequent redirs
- window.addEventListener("million:navigate", () => callback(loader))
- window.addEventListener("DOMContentLoaded", () => callback(loader))
-}
-
-export const callback = (loader) => {
// requestAnimationFrame() delays graph draw until SPA routing is finished
- const draw = () => {
- const container = document.getElementById("graph-container")
- // retry if the graph is not ready
- if (!container) return requestAnimationFrame(draw)
- // clear the graph in case there is anything within it
- container.textContent = ""
-
- loader()
- }
- requestAnimationFrame(draw)
+ window.addEventListener("million:navigate", () => requestAnimationFrame(draw))
+ window.addEventListener("DOMContentLoaded", () => requestAnimationFrame(draw))
}
--
Gitblit v1.10.0