From a09974446d5be617267c2e6ad8c956e88ce83176 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 03 May 2022 17:21:32 +0000
Subject: [PATCH] Merge pull request #123 from aidenybai/fix-popover
---
layouts/partials/head.html | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 93051cb..b917afb 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -35,6 +35,10 @@
<script src="{{$darkMode.Permalink}}"></script>
{{partial "katex.html" .}}
+ {{ $popover := resources.Get "js/popover.js" | resources.Fingerprint "md5" |
+ resources.Minify }}
+ <script src="{{$popover.Permalink}}"></script>
+
<!-- Preload page vars -->
{{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint
"md5" | resources.Minify | }} {{$contentIndex := resources.Get
@@ -59,35 +63,32 @@
}))
</script>
{{if $.Site.Data.config.enableSPA}}
+ {{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" |
+ resources.Minify }}
<script type="module">
- import { router, navigate } from "https://unpkg.com/million/dist/router.mjs";
- // SPA navigation for access later
- window.navigate = navigate;
- // We only mutate document.title and content within .singlePage element
- router(".singlePage");
- const callback = () => {
- // 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 = "";
+ import { attachSPARouting } from '{{$router.Permalink}}';
+ // NOTE: everything within this callback will be executed for every page navigation. This is a good place to put JavaScript that loads or modifies data on the page.
+ 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 = ""
- drawGraph(
- {{strings.TrimRight "/" .Site.BaseURL}},
- {{$.Site.Data.graphConfig.paths}},
- {{$.Site.Data.graphConfig.depth}},
- {{$.Site.Data.graphConfig.enableDrag}},
- {{$.Site.Data.graphConfig.enableLegend}},
- {{$.Site.Data.graphConfig.enableZoom}}
- );
- };
- requestAnimationFrame(draw);
+ drawGraph(
+ {{strings.TrimRight "/" .Site.BaseURL}},
+ {{$.Site.Data.graphConfig.paths}},
+ {{$.Site.Data.graphConfig.depth}},
+ {{$.Site.Data.graphConfig.enableDrag}},
+ {{$.Site.Data.graphConfig.enableLegend}},
+ {{$.Site.Data.graphConfig.enableZoom}}
+ );
+
+ {{if $.Site.Data.config.enableLinkPreview}}
+ initPopover({{strings.TrimRight "/" .Site.BaseURL }})
+ {{end}}
};
- // We need on initial load, then subsequent redirs
- window.addEventListener("million:navigate", callback);
- window.addEventListener("DOMContentLoaded", callback);
+ attachSPARouting(draw);
</script>
{{else}}
<script>window.navigate = (url) => window.location.href = url</script>
--
Gitblit v1.10.0