From fc4b9ded76c31ef940e281d9c1bfda850df23d5d Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 05 Apr 2022 06:20:43 +0000
Subject: [PATCH] Merge pull request #94 from meleu/patch-4

---
 layouts/partials/head.html |   30 ++++++++++--------------------
 1 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 107f240..195cade 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -4,7 +4,7 @@
     <meta name="description" content="{{if .IsHome}}{{$.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}">
     <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="/icon.png" />
+  <link rel="shortcut icon" type="image/png" href="{{$.Site.BaseURL}}/icon.png" />
 
     <!-- CSS Stylesheets and Fonts -->
     <link 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">
@@ -19,38 +19,28 @@
 
     {{ $darkMode := resources.Get "js/darkmode.js" |  resources.Fingerprint "md5" | resources.Minify }}
     <script src="{{$darkMode.Permalink}}"></script>
+    {{partial "katex.html" .}}
 
     <!--  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 }}
     <script>
       const BASE_URL = {{.Site.BaseURL}}
-      let saved = false
-      const fetchData = async () => {
-        if (saved) {
-          return saved
-        } else {
-          const promises = [
-            fetch("{{ .Site.BaseURL }}/linkIndex.json")
+      const fetchData = Promise.all([
+            fetch("{{ $linkIndex.Permalink }}")
               .then(data => data.json())
               .then(data => ({
                 index: data.index,
                 links: data.links,
               })),
-            fetch("{{ .Site.BaseURL }}/contentIndex.json")
+            fetch("{{ $contentIndex.Permalink }}")
               .then(data => data.json()),
-          ]
-          const [{index, links}, content] = await Promise.all(promises)
-          const res = ({
+          ])
+          .then(([{index, links}, content]) => ({
             index,
             links,
             content,
-          })
-          saved = res
-          return res
-        }
-
-      }
-      fetchData()
+          }))
     </script>
 </head>
 {{ template "_internal/google_analytics.html" . }}
-{{ partial "popover.html" .}}

--
Gitblit v1.10.0