From 4cd6f7efdf9161f1a1c7ad381d5bc4f2828eedb8 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 01 Dec 2022 02:00:12 +0000
Subject: [PATCH] fix: text highlighting
---
assets/js/util.js | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/assets/js/util.js b/assets/js/util.js
index 32e1568..d17594a 100644
--- a/assets/js/util.js
+++ b/assets/js/util.js
@@ -55,14 +55,13 @@
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
+ 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)
return (
@@ -109,17 +108,18 @@
// Common utilities for search
const resultToHTML = ({ url, title, content }) => {
- const cleaned = removeMarkdown(content)
return `<button class="result-card" id="${url}">
<h3>${title}</h3>
- <p>${cleaned}</p>
+ <p>${content}</p>
</button>`
}
const redir = (id, term) => {
- // SPA navigation
+ const shouldTrim = PRODUCTION && SEARCH_ENABLED
+ const baseURLPrefix = shouldTrim ? "" : BASE_URL.replace(/\/$/g, "")
+ const urlString = `${baseURLPrefix}${id}#:~:text=${encodeURIComponent(term)}/`
window.Million.navigate(
- new URL(`${BASE_URL.replace(/\/$/g, "")}${id}#:~:text=${encodeURIComponent(term)}/`),
+ new URL(urlString),
".singlePage",
)
closeSearch()
@@ -181,7 +181,7 @@
})
}
-const displayResults = (finalResults, extractHighlight = false) => {
+const displayResults = (term, finalResults, extractHighlight = false) => {
const results = document.getElementById("results-container")
if (finalResults.length === 0) {
results.innerHTML = `<button class="result-card">
@@ -191,16 +191,16 @@
} else {
results.innerHTML = finalResults
.map((result) => {
- if (extractHighlight) {
- return resultToHTML({
- url: result.url,
- title: highlight(result.title, term),
- content: highlight(result.content, term)
- })
- } else {
- return resultToHTML(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