From 84c75d05460dd2974ff04a43f6a770fc31deca63 Mon Sep 17 00:00:00 2001
From: DhammaCharts <100090806+DhammaCharts@users.noreply.github.com>
Date: Mon, 06 Jun 2022 11:56:47 +0000
Subject: [PATCH] Merge branch 'hugo' into hugo
---
layouts/partials/head.html | 82 ++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 26 deletions(-)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2da259d..6eb8eaf 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -5,7 +5,10 @@
name="description"
content="{{if .IsHome}}{{$.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}"
/>
- <title>{{ if .Title }}{{ .Title }}{{ else }}{{ $.Site.Data.config.page_title }}{{ end }}</title>
+ <title>
+ {{ if .Title }}{{ .Title }}{{ else }}{{ $.Site.Data.config.page_title }}{{
+ end }}
+ </title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="shortcut icon" type="image/png" href="{{$.Site.BaseURL}}/icon.png" />
@@ -14,22 +17,28 @@
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" | resources.Minify }}
<script src="{{$darkMode.Permalink}}"></script>
- {{partial "katex.html" .}} {{ $popover := resources.Get "js/popover.js" | resources.Fingerprint
- "md5" | resources.Minify }}
+ {{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 "indices/contentIndex.json" |
- resources.Fingerprint "md5" | resources.Minify }}
+ {{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint
+ "md5" | resources.Minify | }} {{$contentIndex := resources.Get
+ "indices/contentIndex.json" | resources.Fingerprint "md5" | resources.Minify
+ }}
<script>
const BASE_URL = {{.Site.BaseURL}}
const fetchData = Promise.all([
@@ -48,23 +57,38 @@
content,
}))
- const draw = () => {
- // 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 render = () => {
+ // 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, adds event listeners, etc. If you are only dealing with basic DOM replacement, use the init function
+ const siteBaseURL = new URL({{$.Site.BaseURL}});
+ const pathBase = siteBaseURL.pathname;
+ const pathWindow = window.location.pathname;
+ const isHome = pathBase == pathWindow;
+
+ {{if $.Site.Data.config.enableFooter}}
const container = document.getElementById("graph-container")
// retry if the graph is not ready
- if (!container) return requestAnimationFrame(draw)
+ if (!container) return requestAnimationFrame(render)
// 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}}
- );
+ if (isHome && {{$.Site.Data.graphConfig.enableGlobalGraph}}) {
+ drawGraph(
+ {{strings.TrimRight "/" .Site.BaseURL}},
+ true,
+ {{$.Site.Data.graphConfig.paths}},
+ {{$.Site.Data.graphConfig.globalGraph}}
+ );
+ } else {
+ drawGraph(
+ {{strings.TrimRight "/" .Site.BaseURL}},
+ false,
+ {{$.Site.Data.graphConfig.paths}},
+ {{$.Site.Data.graphConfig.localGraph}}
+ );
+ }
+
+ {{end}}
{{if $.Site.Data.config.enableLinkPreview}}
initPopover(
@@ -73,8 +97,12 @@
{{$.Site.Data.config.enableLatex}}
)
{{end}}
+ }
+
+ const init = (doc = document) => {
+ // NOTE: everything within this callback will be executed for initial page navigation. This is a good place to put JavaScript that only replaces DOM nodes.
{{if $.Site.Data.config.enableLatex}}
- renderMathInElement(document.body, {
+ renderMathInElement(doc.body, {
delimiters: [
{left: '$$', right: '$$', display: true},
{left: '$', right: '$', display: false},
@@ -84,11 +112,12 @@
{{end}}
};
</script>
- {{if $.Site.Data.config.enableSPA}} {{ $router := resources.Get "js/router.js" |
- resources.Fingerprint "md5" | resources.Minify }}
+ {{if $.Site.Data.config.enableSPA}}
+ {{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" |
+ resources.Minify }}
<script type="module">
import { attachSPARouting } from "{{$router.Permalink}}"
- attachSPARouting(draw)
+ attachSPARouting(init, render)
</script>
{{else}}
<script>
@@ -96,7 +125,8 @@
navigate: (url) => (window.location.href = url),
prefetch: () => {},
}
- draw()
+ init()
+ render()
</script>
{{end}}
</head>
--
Gitblit v1.10.0