From a78926ede5a951b2ba48e506c93d25060e240c0e Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 11 Aug 2022 18:42:16 +0000
Subject: [PATCH] feat: link previews to page-list (closes #173)
---
assets/styles/base.scss | 6 +++++-
assets/js/util.js | 2 --
layouts/partials/head.html | 40 +++++++++++++++++++++-------------------
layouts/partials/page-list.html | 2 +-
layouts/partials/footerIndex.html | 4 ++--
layouts/partials/footer.html | 4 ++--
6 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/assets/js/util.js b/assets/js/util.js
index 72541d8..06db3c1 100644
--- a/assets/js/util.js
+++ b/assets/js/util.js
@@ -58,14 +58,12 @@
// try to find direct match first
const directMatchIdx = content.indexOf(term)
if (directMatchIdx !== -1) {
- console.log(directMatchIdx)
const h = highlightWindow
const before = content.substring(0, directMatchIdx).split(" ").slice(-h)
const after = content
.substring(directMatchIdx + term.length, content.length - 2)
.split(" ")
.slice(0, h)
- console.log(before, after)
return (
(before.length == h ? `...${before.join(" ")}` : before.join(" ")) +
`<span class="search-highlight">${term}</span>` +
diff --git a/assets/styles/base.scss b/assets/styles/base.scss
index f7ad909..2b3d907 100644
--- a/assets/styles/base.scss
+++ b/assets/styles/base.scss
@@ -592,9 +592,13 @@
font-size: 0.8rem;
}
+ & > p {
+ margin: 0;
+ padding: 0.5rem 0;
+ }
+
& > p, & > a {
font-size: 1rem;
- margin: 0.7rem 0;
font-weight: 400;
user-select: none;
}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index ddefe75..cab44cb 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -3,7 +3,7 @@
<hr/>
{{if $.Site.Data.config.enableFooter}}
-<div class="page-end">
+<div class="page-end" id="footer">
<div class="backlinks-container">
{{partial "backlinks.html" .}}
</div>
@@ -13,4 +13,4 @@
</div>
{{end}}
-{{partial "contact.html" .}}
\ No newline at end of file
+{{partial "contact.html" .}}
diff --git a/layouts/partials/footerIndex.html b/layouts/partials/footerIndex.html
index 5f19044..5b73fa4 100644
--- a/layouts/partials/footerIndex.html
+++ b/layouts/partials/footerIndex.html
@@ -1,6 +1,6 @@
{{if $.Site.Data.config.enableFooter}}
{{if $.Site.Data.graphConfig.enableGlobalGraph}}
- <div class="page-end">
+ <div class="page-end" id="footer">
<div>
{{partial "graph.html" .}}
@@ -9,7 +9,7 @@
</div>
{{else}}
<hr/>
- <div class="page-end">
+ <div class="page-end" id="footer">
<div class="backlinks-container">
{{partial "backlinks.html" .}}
</div>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index acc2efd..6b465da 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -112,25 +112,7 @@
{{if $.Site.Data.config.enableCallouts -}}
addCollapsibleCallouts();
{{ end }}
-
- {{if $.Site.Data.config.enableFooter}}
- const container = document.getElementById("graph-container")
- // retry if the graph is not ready
- if (!container) return requestAnimationFrame(render)
- // clear the graph in case there is anything within it
- container.textContent = ""
-
- const drawGlobal = isHome && {{$.Site.Data.graphConfig.enableGlobalGraph}};
- drawGraph(
- {{strings.TrimRight "/" .Site.BaseURL}},
- drawGlobal,
- {{$.Site.Data.graphConfig.paths}},
- drawGlobal ? {{$.Site.Data.graphConfig.globalGraph}} : {{$.Site.Data.graphConfig.localGraph}}
- );
-
- {{end}}
-
-
+
{{if $.Site.Data.config.enableLinkPreview}}
initPopover(
{{strings.TrimRight "/" .Site.BaseURL }},
@@ -138,6 +120,26 @@
{{$.Site.Data.config.enableLatex}}
)
{{end}}
+
+ {{if $.Site.Data.config.enableFooter}}
+ const footer = document.getElementById("footer")
+ if (footer) {
+ const container = document.getElementById("graph-container")
+ // retry if the graph is not ready
+ if (!container) return requestAnimationFrame(render)
+ // clear the graph in case there is anything within it
+ container.textContent = ""
+
+ const drawGlobal = isHome && {{$.Site.Data.graphConfig.enableGlobalGraph}};
+ drawGraph(
+ {{strings.TrimRight "/" .Site.BaseURL}},
+ drawGlobal,
+ {{$.Site.Data.graphConfig.paths}},
+ drawGlobal ? {{$.Site.Data.graphConfig.globalGraph}} : {{$.Site.Data.graphConfig.localGraph}}
+ );
+
+ }
+ {{end}}
}
const init = (doc = document) => {
diff --git a/layouts/partials/page-list.html b/layouts/partials/page-list.html
index 385a0e7..1d2a477 100644
--- a/layouts/partials/page-list.html
+++ b/layouts/partials/page-list.html
@@ -6,7 +6,7 @@
{{partial "date-fmt.html" .}}
</p>
<div class="desc">
- <h3><a href="{{ .Permalink }}">{{- .Title -}}</a></h3>
+ <h3><a href="{{ .Permalink }}" class="internal-link" data-src="{{ .RelPermalink }}">{{- .Title -}}</a></h3>
</div>
<div class="spacer"></div>
<ul class="tags">
--
Gitblit v1.10.0