ndumas
/
quartz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: merge conf

Browse Source
hugo
Jacky Zhao 3 years ago
parent cea0f3eb74 8b855b522a
commit 364aee36fc
14 changed files with 84 additions and 100 deletions
Show Stats Download Patch File Download Diff File

8
assets/js/graph.js
Unescape Escape View File

@ -1,5 +1,4 @@
async function drawGraph(
url,
baseUrl,
pathColors,
depth,
@ -8,9 +7,12 @@ async function drawGraph(
enableZoom
) {
const container = document.getElementById('graph-container')
const { index, links, content } = await fetchData
const curPage = url.replace(baseUrl, '')
// 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])),

5
assets/js/popover.js
Unescape Escape View File

@ -1,5 +1,5 @@
function htmlToElement(html) {
const template = document.createElement('template')
const template = document.createElement("template")
html = html.trim()
template.innerHTML = html
return template.content.firstChild
@ -7,14 +7,12 @@ function htmlToElement(html) {
function initPopover(baseURL, useContextualBacklinks) {
const basePath = baseURL.replace(window.location.origin, "")
document.addEventListener("DOMContentLoaded", () => {
fetchData.then(({ content }) => {
const links = [...document.getElementsByClassName("internal-link")]
links
.filter(li => li.dataset.src || (li.dataset.idx && useContextualBacklinks))
.forEach(li => {
if (li.dataset.ctx) {
console.log(li.dataset.ctx)
const linkDest = content[li.dataset.src]
const popoverElement = `<div class="popover">
<h3>${linkDest.title}</h3>
@ -49,5 +47,4 @@ function initPopover(baseURL, useContextualBacklinks) {
}
})
})
})
}

12
assets/js/router.js
Unescape Escape View File

@ -0,0 +1,12 @@
import { router, navigate } from "https://unpkg.com/million@1.8.9-0/dist/router.mjs"
export const attachSPARouting = (draw) => {
// SPA navigation for access later
window.navigate = navigate
// We only mutate document.title and content within .singlePage element
router(".singlePage")
// We need on initial load, then subsequent redirs
// requestAnimationFrame() delays graph draw until SPA routing is finished
window.addEventListener("million:navigate", () => requestAnimationFrame(draw))
window.addEventListener("DOMContentLoaded", () => requestAnimationFrame(draw))
}

2
assets/js/search.js
Unescape Escape View File

@ -154,7 +154,7 @@ const highlight = (content, term) => {
// SPA navigation
window.navigate(
new URL(
`${BASE_URL}${id}#:~:text=${encodeURIComponent(term)}/`
`${BASE_URL.replace(/\/$/g, "")}${id}#:~:text=${encodeURIComponent(term)}/`
),
'.singlePage'
)

2
data/config.yaml
Unescape Escape View File

@ -3,7 +3,7 @@ enableToc: true
openToc: false
enableLinkPreview: true
enableLatex: true
enableSPA: false
enableSPA: true
enableContextualBacklinks: true
description:
Host your second brain and digital garden for free. Quartz features extremely fast full-text search,

1
layouts/_default/section.html
Unescape Escape View File

@ -19,7 +19,6 @@
</article>
{{partial "contact.html" .}}
</div>
{{partial "popover.html" .}}
</body>
</html>

1
layouts/_default/single.html
Unescape Escape View File

@ -26,7 +26,6 @@
{{partial "textprocessing.html" . }}
</article>
{{partial "footer.html" .}}
{{partial "popover.html" .}}
</div>
</body>

1
layouts/_default/taxonomy.html
Unescape Escape View File

@ -28,7 +28,6 @@
</article>
{{partial "contact.html" .}}
</div>
{{partial "popover.html" .}}
</body>
</html>

1
layouts/_default/term.html
Unescape Escape View File

@ -19,7 +19,6 @@
</article>
{{partial "contact.html" .}}
</div>
{{partial "popover.html" .}}
</body>
</html>

2
layouts/index.html
Unescape Escape View File

@ -17,8 +17,6 @@
{{partial "textprocessing.html" . }}
</article>
{{partial "footer.html" .}}
{{partial "popover.html" .}}
</div>
</body>
</html>

11
layouts/partials/graph.html
Unescape Escape View File

@ -16,14 +16,3 @@
</style>
{{ $js := resources.Get "js/graph.js" | resources.Fingerprint "md5" }}
<script src="{{ $js.Permalink }}"></script>
<script>
drawGraph(
{{strings.TrimRight "/" .Page.Permalink}},
{{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>

41
layouts/partials/head.html
Unescape Escape View File

@ -35,6 +35,10 @@
<script src="{{$darkMode.Permalink}}"></script>
{{partial "katex.html" .}}
{{ $popover := resources.Get "js/popover.js" | resources.Fingerprint "md5" |
resources.Minify }}
<script src="{{$popover.Permalink}}"></script>
<!-- Preload page vars -->
{{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint
"md5" | resources.Minify | }} {{$contentIndex := resources.Get
@ -59,23 +63,19 @@
}))
</script>
{{if $.Site.Data.config.enableSPA}}
{{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" |
resources.Minify }}
<script type="module">
import { router, navigate } from "https://unpkg.com/million/dist/router.mjs";
// SPA navigation for access later
window.navigate = navigate;
// We only mutate document.title and content within .singlePage element
router(".singlePage");
const callback = () => {
// requestAnimationFrame() delays graph draw until SPA routing is finished
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");
const container = document.getElementById("graph-container")
// retry if the graph is not ready
if (!container) return requestAnimationFrame(draw);
if (!container) return requestAnimationFrame(draw)
// clear the graph in case there is anything within it
container.textContent = "";
container.textContent = ""
drawGraph(
{{strings.TrimRight "/" .Page.Permalink}},
{{strings.TrimRight "/" .Site.BaseURL}},
{{$.Site.Data.graphConfig.paths}},
{{$.Site.Data.graphConfig.depth}},
@ -83,12 +83,21 @@
{{$.Site.Data.graphConfig.enableLegend}},
{{$.Site.Data.graphConfig.enableZoom}}
);
{{if $.Site.Data.config.enableLinkPreview}}
initPopover({{strings.TrimRight "/" .Site.BaseURL }}, {{$.Site.Data.config.enableContextualBacklinks}})
{{end}}
{{if $.Site.Data.config.enableLatex}}
renderMathInElement(document.body, {
delimiters: [
{left: '$$', right: '$$', display: true},
{left: '$', right: '$', display: false},
],
throwOnError : false
});
{{end}}
};
requestAnimationFrame(draw);
};
// We need on initial load, then subsequent redirs
window.addEventListener("million:navigate", callback);
window.addEventListener("DOMContentLoaded", callback);
attachSPARouting(draw);
</script>
{{else}}
<script>window.navigate = (url) => window.location.href = url</script>

11
layouts/partials/katex.html
Unescape Escape View File

@ -2,15 +2,4 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/katex.min.css" integrity="sha384-R4558gYOUz8mP9YWpZJjofhk+zx0AS11p36HnD2ZKj/6JR5z27gSSULCNHIRReVs" crossorigin="anonymous">
<script defer src="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/katex.min.js" integrity="sha384-z1fJDqw8ZApjGO3/unPWUPsIymfsJmyrDVWC8Tv/a1HeOtGmkwNd/7xUS0Xcnvsx" crossorigin="anonymous"></script>
<script defer src="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/contrib/auto-render.min.js" integrity="sha384-+XBljXPPiv+OzfbB3cVmLHf4hdUFHlWNZN5spNQ7rmHTXpd7WvJum6fIACpNNfIR" crossorigin="anonymous"></script>
<script>
document.addEventListener("DOMContentLoaded", function() {
renderMathInElement(document.body, {
delimiters: [
{left: '$$', right: '$$', display: true},
{left: '$', right: '$', display: false},
],
throwOnError : false
});
});
</script>
{{end}}

8
layouts/partials/popover.html
Unescape Escape View File

@ -1,8 +0,0 @@
{{if $.Site.Data.config.enableLinkPreview}}
{{ $js := resources.Get "js/popover.js" | resources.Fingerprint "md5" | resources.Minify }}
<script src="{{ $js.Permalink }}"></script>
<script>
const useContextual = {{ $.Site.Data.config.enableContextualBacklinks }}
initPopover({{strings.TrimRight "/" .Site.BaseURL }}, useContextual)
</script>
{{end}}
Write Preview
Loading…
Cancel
Save