From 6e6dd4cb0b396ae7ec4f273bccd254bc0f9885d5 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 03 May 2022 14:57:20 +0000
Subject: [PATCH] fix: trim trailing slash when calculating popover
---
layouts/partials/head.html | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index ea67a00..37938a5 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -21,10 +21,13 @@
href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&family=Source+Sans+Pro:wght@400;600;700&family=Fira+Code:wght@400;700&display=swap"
rel="stylesheet"
/>
- {{$sass := resources.Match "styles/[!_]*.scss" }} {{$css := slice }} {{range
- $sass}} {{$scss := . | resources.ToCSS (dict "outputStyle" "compressed") }}
- {{$css = $css | append $scss}} {{end}} {{$finalCss := $css | resources.Concat
- "styles.css" | resources.Fingerprint "md5" | resources.Minify }}
+ {{$sass := resources.Match "styles/[!_]*.scss" }}
+ {{$css := slice }}
+ {{range $sass}}
+ {{$scss := . | resources.ToCSS (dict "outputStyle" "compressed") }}
+ {{$css = $css | append $scss}}
+ {{end}}
+ {{$finalCss := $css | resources.Concat "styles.css" | resources.Fingerprint "md5" | resources.Minify }}
<link href="{{$finalCss.Permalink}}" rel="stylesheet" />
{{ $darkMode := resources.Get "js/darkmode.js" | resources.Fingerprint "md5" |
@@ -55,6 +58,7 @@
content,
}))
</script>
+ {{if $.Site.Data.config.enableSPA}}
<script type="module">
import { router, navigate } from "https://unpkg.com/million/dist/router.mjs";
// SPA navigation for access later
@@ -62,7 +66,7 @@
// We only mutate document.title and content within .singlePage element
router(".singlePage");
const callback = () => {
- // requestAnimationFrame()
+ // requestAnimationFrame() delays graph draw until SPA routing is finished
const draw = () => {
const container = document.getElementById("graph-container");
// retry if the graph is not ready
@@ -86,5 +90,8 @@
window.addEventListener("million:navigate", callback);
window.addEventListener("DOMContentLoaded", callback);
</script>
+ {{else}}
+ <script>window.navigate = (url) => window.location.href = url</script>
+ {{end}}
</head>
{{ template "_internal/google_analytics.html" . }}
--
Gitblit v1.10.0