Merge pull request jackyzha0#124 from aidenybai/hugo

shreyas-makes · May 3, 2022 · b67a389 · b67a389
2 parents a099744 + 2b5c03c
commit b67a389
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/assets/js/graph.js b/assets/js/graph.js
@@ -7,9 +7,12 @@ async function drawGraph(
   enableZoom
 ) {
   const container = document.getElementById('graph-container')
-
   const { index, links, content } = await fetchData
-  const curPage = window.location.href.replace(baseUrl, "").replace(/\/$/g, "")
+
+  // Use .pathname to remove hashes / searchParams / text fragments
+  const cleanUrl = window.location.origin + window.location.pathname
+
+  const curPage = cleanUrl.replace(/\/$/g, "").replace(baseUrl, "")
 
   const parseIdsFromLinks = (links) => [
     ...new Set(links.flatMap((link) => [link.source, link.target])),

diff --git a/assets/js/search.js b/assets/js/search.js
@@ -144,7 +144,7 @@ const removeMarkdown = (
     // SPA navigation
     window.navigate(
       new URL(
-        `${BASE_URL}${id}#:~:text=${encodeURIComponent(term)}/`
+        `${BASE_URL.replace(/\/$/g, "")}${id}#:~:text=${encodeURIComponent(term)}/`
       ),
       '.singlePage'
     )

diff --git a/layouts/partials/graph.html b/layouts/partials/graph.html
@@ -16,13 +16,3 @@ <h3>Interactive Graph</h3>
 </style>
 {{ $js := resources.Get "js/graph.js" | resources.Fingerprint "md5" }}
 <script src="{{ $js.Permalink }}"></script>
-<script>
-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}}
-);
-</script>