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
---
layouts/partials/head.html | 75 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 772153a..a8d947e 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" |
@@ -32,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
@@ -55,33 +62,45 @@
content,
}))
</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";
- window.navigate = navigate;
- router(".singlePage");
- const callback = () => {
- 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 "/" .Page.Permalink}},
- {{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 }}, {{$.Site.Data.config.enableContextualBacklinks}})
+ {{end}}
+ {{if $.Site.Data.config.enableLatex}}
+ renderMathInElement(document.body, {
+ delimiters: [
+ {left: '$$', right: '$$', display: true},
+ {left: '$', right: '$', display: false},
+ ],
+ throwOnError : false
+ });
+ {{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>
+ {{end}}
</head>
{{ template "_internal/google_analytics.html" . }}
--
Gitblit v1.10.0