From 5c76d8dad9d993010c4e57c6de4e90911a3cd11a Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 05 Aug 2022 18:08:52 +0000
Subject: [PATCH] fix: make callout detection case-insensitive (closes #171)
---
assets/js/util.js | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/assets/js/util.js b/assets/js/util.js
index c465238..72541d8 100644
--- a/assets/js/util.js
+++ b/assets/js/util.js
@@ -55,16 +55,17 @@
const highlight = (content, term) => {
const highlightWindow = 20
-
// try to find direct match first
const directMatchIdx = content.indexOf(term)
if (directMatchIdx !== -1) {
- const h = highlightWindow / 2
+ console.log(directMatchIdx)
+ const h = highlightWindow
const before = content.substring(0, directMatchIdx).split(" ").slice(-h)
const after = content
- .substring(directMatchIdx + term.length, content.length - 1)
+ .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>` +
@@ -108,13 +109,10 @@
}
// Common utilities for search
-const resultToHTML = ({ url, title, content, term }) => {
- const text = removeMarkdown(content)
- const resultTitle = highlight(title, term)
- const resultText = highlight(text, term)
+const resultToHTML = ({ url, title, content }) => {
return `<button class="result-card" id="${url}">
- <h3>${resultTitle}</h3>
- <p>${resultText}</p>
+ <h3>${title}</h3>
+ <p>${content}</p>
</button>`
}
@@ -183,7 +181,7 @@
})
}
-const displayResults = (finalResults) => {
+const displayResults = (finalResults, extractHighlight = false) => {
const results = document.getElementById("results-container")
if (finalResults.length === 0) {
results.innerHTML = `<button class="result-card">
@@ -192,11 +190,17 @@
</button>`
} else {
results.innerHTML = finalResults
- .map((result) =>
- resultToHTML({
- ...result,
- term,
- }),
+ .map((result) => {
+ if (extractHighlight) {
+ return resultToHTML({
+ url: result.url,
+ title: highlight(result.title, term),
+ content: highlight(removeMarkdown(result.content), term)
+ })
+ } else {
+ return resultToHTML(result)
+ }
+ }
)
.join("\n")
const anchors = [...document.getElementsByClassName("result-card")]
--
Gitblit v1.10.0