From 5fd707714faaaac5c3d39ec056ff88446fcb3cc2 Mon Sep 17 00:00:00 2001
From: Jon Erling Hustadnes <jonerling.hustadnes@gmail.com>
Date: Sun, 27 Nov 2022 18:55:43 +0000
Subject: [PATCH] feat: Added Norwegian localization (#242)
---
assets/js/util.js | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/assets/js/util.js b/assets/js/util.js
index c465238..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 (
@@ -108,20 +107,19 @@
}
// 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>`
}
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()
@@ -183,7 +181,7 @@
})
}
-const displayResults = (finalResults) => {
+const displayResults = (term, 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