Fix popover

This commit is contained in:
Aiden Bai 2022-05-03 08:47:42 -07:00
parent 6e6dd4cb0b
commit 77485b754d
No known key found for this signature in database
GPG Key ID: D37584388675FF3A
9 changed files with 67 additions and 64 deletions

View File

@ -1,5 +1,5 @@
function htmlToElement(html) { function htmlToElement(html) {
const template = document.createElement('template') const template = document.createElement("template")
html = html.trim() html = html.trim()
template.innerHTML = html template.innerHTML = html
return template.content.firstChild return template.content.firstChild
@ -7,12 +7,11 @@ function htmlToElement(html) {
function initPopover(baseURL) { function initPopover(baseURL) {
const basePath = baseURL.replace(window.location.origin, "") const basePath = baseURL.replace(window.location.origin, "")
document.addEventListener("DOMContentLoaded", () => {
fetchData.then(({ content }) => { fetchData.then(({ content }) => {
const links = [...document.getElementsByClassName("internal-link")] const links = [...document.getElementsByClassName("internal-link")]
links links
.filter(li => li.dataset.src) .filter((li) => li.dataset.src)
.forEach(li => { .forEach((li) => {
const linkDest = content[li.dataset.src.replace(/\/$/g, "").replace(basePath, "")] const linkDest = content[li.dataset.src.replace(/\/$/g, "").replace(basePath, "")]
if (linkDest) { if (linkDest) {
const popoverElement = `<div class="popover"> const popoverElement = `<div class="popover">
@ -31,5 +30,4 @@ function initPopover(baseURL) {
} }
}) })
}) })
})
} }

25
assets/js/router.js Normal file
View File

@ -0,0 +1,25 @@
import { router, navigate } from "https://unpkg.com/million/dist/router.mjs"
export const init = (loader) => {
// 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
window.addEventListener("million:navigate", () => callback(loader))
window.addEventListener("DOMContentLoaded", () => callback(loader))
}
export const callback = (loader) => {
// 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 = ""
loader()
}
requestAnimationFrame(draw)
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -35,6 +35,10 @@
<script src="{{$darkMode.Permalink}}"></script> <script src="{{$darkMode.Permalink}}"></script>
{{partial "katex.html" .}} {{partial "katex.html" .}}
{{ $popover := resources.Get "js/popover.js" | resources.Fingerprint "md5" |
resources.Minify }}
<script src="{{$popover.Permalink}}"></script>
<!-- Preload page vars --> <!-- Preload page vars -->
{{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint {{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint
"md5" | resources.Minify | }} {{$contentIndex := resources.Get "md5" | resources.Minify | }} {{$contentIndex := resources.Get
@ -59,21 +63,11 @@
})) }))
</script> </script>
{{if $.Site.Data.config.enableSPA}} {{if $.Site.Data.config.enableSPA}}
{{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" |
resources.Minify }}
<script type="module"> <script type="module">
import { router, navigate } from "https://unpkg.com/million/dist/router.mjs"; import { init } from '{{$router.Permalink}}';
// SPA navigation for access later init(() => {
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 = "";
drawGraph( drawGraph(
{{strings.TrimRight "/" .Page.Permalink}}, {{strings.TrimRight "/" .Page.Permalink}},
{{strings.TrimRight "/" .Site.BaseURL}}, {{strings.TrimRight "/" .Site.BaseURL}},
@ -83,12 +77,11 @@
{{$.Site.Data.graphConfig.enableLegend}}, {{$.Site.Data.graphConfig.enableLegend}},
{{$.Site.Data.graphConfig.enableZoom}} {{$.Site.Data.graphConfig.enableZoom}}
); );
};
requestAnimationFrame(draw); {{if $.Site.Data.config.enableLinkPreview}}
}; initPopover({{strings.TrimRight "/" .Site.BaseURL }})
// We need on initial load, then subsequent redirs {{end}}
window.addEventListener("million:navigate", callback); });
window.addEventListener("DOMContentLoaded", callback);
</script> </script>
{{else}} {{else}}
<script>window.navigate = (url) => window.location.href = url</script> <script>window.navigate = (url) => window.location.href = url</script>

View File

@ -1,7 +0,0 @@
{{if $.Site.Data.config.enableLinkPreview}}
{{ $js := resources.Get "js/popover.js" | resources.Fingerprint "md5" | resources.Minify }}
<script src="{{ $js.Permalink }}"></script>
<script>
initPopover({{strings.TrimRight "/" .Site.BaseURL }})
</script>
{{end}}