From b67a389beacfade21276461f3e275c07969664e5 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 03 May 2022 17:59:02 +0000
Subject: [PATCH] Merge pull request #124 from aidenybai/hugo
---
assets/js/search.js | 2 +-
layouts/partials/graph.html | 10 ----------
assets/js/graph.js | 7 +++++--
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/assets/js/graph.js b/assets/js/graph.js
index db1cfe2..f71e44d 100644
--- a/assets/js/graph.js
+++ b/assets/js/graph.js
@@ -7,9 +7,12 @@
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
index f124d58..26ea39a 100644
--- a/assets/js/search.js
+++ b/assets/js/search.js
@@ -144,7 +144,7 @@
// 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
index 6bc77b6..b9f7976 100644
--- a/layouts/partials/graph.html
+++ b/layouts/partials/graph.html
@@ -16,13 +16,3 @@
</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>
--
Gitblit v1.10.0