From 3789df80e437f9e31560e7eed14e33d80e5ff3a0 Mon Sep 17 00:00:00 2001
From: Aiden Bai 白宇彤 <aiden.bai05@gmail.com>
Date: Tue, 03 May 2022 16:33:00 +0000
Subject: [PATCH] Merge branch 'hugo' into fix-popover
---
assets/js/graph.js | 3 +--
layouts/partials/head.html | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/assets/js/graph.js b/assets/js/graph.js
index c5829e9..db1cfe2 100644
--- a/assets/js/graph.js
+++ b/assets/js/graph.js
@@ -1,5 +1,4 @@
async function drawGraph(
- url,
baseUrl,
pathColors,
depth,
@@ -10,7 +9,7 @@
const container = document.getElementById('graph-container')
const { index, links, content } = await fetchData
- const curPage = url.replace(baseUrl, '')
+ const curPage = window.location.href.replace(baseUrl, "").replace(/\/$/g, "")
const parseIdsFromLinks = (links) => [
...new Set(links.flatMap((link) => [link.source, link.target])),
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 60ff782..80ecb24 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -69,7 +69,6 @@
import { init } from '{{$router.Permalink}}';
init(() => {
drawGraph(
- {{strings.TrimRight "/" .Page.Permalink}},
{{strings.TrimRight "/" .Site.BaseURL}},
{{$.Site.Data.graphConfig.paths}},
{{$.Site.Data.graphConfig.depth}},
@@ -77,7 +76,7 @@
{{$.Site.Data.graphConfig.enableLegend}},
{{$.Site.Data.graphConfig.enableZoom}}
);
-
+
{{if $.Site.Data.config.enableLinkPreview}}
initPopover({{strings.TrimRight "/" .Site.BaseURL }})
{{end}}
--
Gitblit v1.10.0