fix: merge conf
This commit is contained in:
commit
364aee36fc
14 changed files with 84 additions and 100 deletions
|
@ -19,7 +19,6 @@
|
|||
</article>
|
||||
{{partial "contact.html" .}}
|
||||
</div>
|
||||
{{partial "popover.html" .}}
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
|
@ -22,11 +22,10 @@
|
|||
<li><a href="{{ .Permalink }}">{{ .LinkTitle | humanize }}</a></li>
|
||||
{{ end }}
|
||||
</ul>
|
||||
{{partial "toc.html" .}}
|
||||
{{partial "toc.html" .}}
|
||||
{{partial "textprocessing.html" . }}
|
||||
</article>
|
||||
{{partial "footer.html" .}}
|
||||
{{partial "popover.html" .}}
|
||||
</div>
|
||||
</body>
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
</article>
|
||||
{{partial "contact.html" .}}
|
||||
</div>
|
||||
{{partial "popover.html" .}}
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
</article>
|
||||
{{partial "contact.html" .}}
|
||||
</div>
|
||||
{{partial "popover.html" .}}
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
|
@ -13,12 +13,10 @@
|
|||
{{partial "darkmode.html" .}}
|
||||
</header>
|
||||
<article>
|
||||
{{partial "toc.html" .}}
|
||||
{{partial "toc.html" .}}
|
||||
{{partial "textprocessing.html" . }}
|
||||
</article>
|
||||
{{partial "footer.html" .}}
|
||||
{{partial "popover.html" .}}
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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,36 +63,41 @@
|
|||
}))
|
||||
</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
|
||||
const draw = () => {
|
||||
const container = document.getElementById("graph-container");
|
||||
// retry if the graph is not ready
|
||||
if (!container) return requestAnimationFrame(draw);
|
||||
// clear the graph in case there is anything within it
|
||||
container.textContent = "";
|
||||
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")
|
||||
// retry if the graph is not ready
|
||||
if (!container) return requestAnimationFrame(draw)
|
||||
// clear the graph in case there is anything within it
|
||||
container.textContent = ""
|
||||
|
||||
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}}
|
||||
);
|
||||
};
|
||||
requestAnimationFrame(draw);
|
||||
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}}
|
||||
);
|
||||
|
||||
{{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}}
|
||||
};
|
||||
// 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>
|
||||
|
|
|
@ -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}}
|
||||
|
|
|
@ -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}}
|
Loading…
Add table
Add a link
Reference in a new issue