fix: clean wikilinks and render latex in popover

shreyas-makes · May 6, 2022 · b21b27d · b21b27d
1 parent 364aee3
commit b21b27d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 19 deletions.
diff --git a/assets/js/popover.js b/assets/js/popover.js
@@ -5,46 +5,53 @@ function htmlToElement(html) {
   return template.content.firstChild
 }
 
-function initPopover(baseURL, useContextualBacklinks) {
+function initPopover(baseURL, useContextualBacklinks, renderLatex) {
   const basePath = baseURL.replace(window.location.origin, "")
   fetchData.then(({ content }) => {
     const links = [...document.getElementsByClassName("internal-link")]
     links
       .filter(li => li.dataset.src || (li.dataset.idx && useContextualBacklinks))
       .forEach(li => {
+        var el
         if (li.dataset.ctx) {
           const linkDest = content[li.dataset.src]
           const popoverElement = `<div class="popover">
     <h3>${linkDest.title}</h3>
     <p>${highlight(removeMarkdown(linkDest.content), li.dataset.ctx)}...</p>
     <p class="meta">${new Date(linkDest.lastmodified).toLocaleDateString()}</p>
 </div>`
-          const el = htmlToElement(popoverElement)
-          li.appendChild(el)
-          li.addEventListener("mouseover", () => {
-            el.classList.add("visible")
-          })
-          li.addEventListener("mouseout", () => {
-            el.classList.remove("visible")
-          })
+          el = htmlToElement(popoverElement)
         } else {
           const linkDest = content[li.dataset.src.replace(/\/$/g, "").replace(basePath, "")]
+          console.log(linkDest.content)
           if (linkDest) {
             const popoverElement = `<div class="popover">
     <h3>${linkDest.title}</h3>
     <p>${removeMarkdown(linkDest.content).split(" ", 20).join(" ")}...</p>
     <p class="meta">${new Date(linkDest.lastmodified).toLocaleDateString()}</p>
 </div>`
-            const el = htmlToElement(popoverElement)
-            li.appendChild(el)
-            li.addEventListener("mouseover", () => {
-              el.classList.add("visible")
-            })
-            li.addEventListener("mouseout", () => {
-              el.classList.remove("visible")
-            })
+            el = htmlToElement(popoverElement)
           }
         }
+        li.appendChild(el)
+        if (renderLatex) {
+          renderMathInElement(el, {
+            delimiters: [
+              { left: '$$', right: '$$', display: false },
+              { left: '$', right: '$', display: false },
+              { left: '\\(', right: '\\)', display: false },
+              { left: '\\[', right: '\\]', display: false }
+            ],
+            throwOnError: false
+          })
+        }
+        li.addEventListener("mouseover", () => {
+          el.classList.add("visible")
+        })
+        li.addEventListener("mouseout", () => {
+          el.classList.remove("visible")
+        })
+
       })
   })
 }
diff --git a/assets/js/search.js b/assets/js/search.js
@@ -39,6 +39,7 @@ const removeMarkdown = (
       .replace(/\s{0,2}\[.*?\]: .*?$/g, '')
       .replace(/\!\[(.*?)\][\[\(].*?[\]\)]/g, options.useImgAltText ? '$1' : '')
       .replace(/\[(.*?)\][\[\(].*?[\]\)]/g, '$1')
+      .replace(/!?\[\[\S[^\[\]\|]*(?:\|([^\[\]]*))?\S\]\]/g, '$1')
       .replace(/^\s{0,3}>\s?/g, '')
       .replace(/(^|\n)\s{0,3}>\s?/g, '\n\n')
       .replace(/^\s{1,2}\[(.*?)\]: (\S+)( ".*?")?\s*$/g, '')

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -85,7 +85,11 @@
       );
 
       {{if $.Site.Data.config.enableLinkPreview}}
-      initPopover({{strings.TrimRight "/" .Site.BaseURL }}, {{$.Site.Data.config.enableContextualBacklinks}})
+      initPopover(
+        {{strings.TrimRight "/" .Site.BaseURL }},
+        {{$.Site.Data.config.enableContextualBacklinks}},
+        {{$.Site.Data.config.enableLatex}}
+      )
       {{end}}
       {{if $.Site.Data.config.enableLatex}}
       renderMathInElement(document.body, {

diff --git a/layouts/partials/page-list.html b/layouts/partials/page-list.html
@@ -12,4 +12,4 @@ <h3><a href="{{ .Permalink }}">{{- .Title -}}</a></h3>
         </div>
     </li>
     {{- end -}}
-</ul>
+</ul>
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,4 @@ <h3><a href="{{ .Permalink }}">{{- .Title -}}</a></h3> @@
             </div>
         </li>
         {{- end -}}
-    </ul>
+    </ul>