From 0439c163a03fc50487fbe1cbfc09dc38af7ed2f2 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 20 May 2022 20:50:56 +0000
Subject: [PATCH] fix: js not executing if spa disabled

---
 layouts/partials/head.html |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index a5f23da..a49800b 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -61,13 +61,7 @@
           links,
           content,
         }))
-  </script>
-  {{if $.Site.Data.config.enableSPA}}
-  {{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" |
-  resources.Minify }}
-  <script type="module">
-    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
@@ -101,10 +95,21 @@
       });
       {{end}}
     };
+  </script>
+  {{if $.Site.Data.config.enableSPA}}
+  {{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" |
+  resources.Minify }}
+  <script type="module">
+    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.
+
     attachSPARouting(draw);
   </script>
   {{else}}
-  <script>window.navigate = (url) => window.location.href = url</script>
+  <script>
+    window.navigate = (url) => window.location.href = url;
+    draw();
+  </script>
   {{end}}
 </head>
 {{ template "_internal/google_analytics.html" . }}

--
Gitblit v1.10.0