From 364aee36fc8891c48ab2bd20c396ce321cd7a0a6 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 05 May 2022 05:03:09 +0000
Subject: [PATCH] fix: merge conf
---
assets/js/search.js | 247 +++++++++++++++++++++++++------------------------
1 files changed, 127 insertions(+), 120 deletions(-)
diff --git a/assets/js/search.js b/assets/js/search.js
index 212b2c7..975eaa6 100644
--- a/assets/js/search.js
+++ b/assets/js/search.js
@@ -9,8 +9,8 @@
preserveLinks: false,
}
) => {
- let output = markdown || '';
- output = output.replace(/^(-\s*?|\*\s*?|_\s*?){3,}\s*$/gm, '');
+ let output = markdown || ''
+ output = output.replace(/^(-\s*?|\*\s*?|_\s*?){3,}\s*$/gm, '')
try {
if (options.stripListLeaders) {
@@ -18,48 +18,101 @@
output = output.replace(
/^([\s\t]*)([\*\-\+]|\d+\.)\s+/gm,
options.listUnicodeChar + ' $1'
- );
- else output = output.replace(/^([\s\t]*)([\*\-\+]|\d+\.)\s+/gm, '$1');
+ )
+ else output = output.replace(/^([\s\t]*)([\*\-\+]|\d+\.)\s+/gm, '$1')
}
if (options.gfm) {
output = output
.replace(/\n={2,}/g, '\n')
.replace(/~{3}.*\n/g, '')
.replace(/~~/g, '')
- .replace(/`{3}.*\n/g, '');
+ .replace(/`{3}.*\n/g, '')
}
if (options.preserveLinks) {
- output = output.replace(/\[(.*?)\][\[\(](.*?)[\]\)]/g, '$1 ($2)');
+ output = output.replace(/\[(.*?)\][\[\(](.*?)[\]\)]/g, '$1 ($2)')
}
output = output
.replace(/<[^>]*>/g, '')
.replace(/^[=\-]{2,}\s*$/g, '')
.replace(/\[\^.+?\](\: .*?$)?/g, '')
+ .replace(/(#{1,6})\s+(.+)\1?/g, '<b>$2</b>')
.replace(/\s{0,2}\[.*?\]: .*?$/g, '')
.replace(/\!\[(.*?)\][\[\(].*?[\]\)]/g, options.useImgAltText ? '$1' : '')
.replace(/\[(.*?)\][\[\(].*?[\]\)]/g, '$1')
.replace(/^\s{0,3}>\s?/g, '')
.replace(/(^|\n)\s{0,3}>\s?/g, '\n\n')
.replace(/^\s{1,2}\[(.*?)\]: (\S+)( ".*?")?\s*$/g, '')
- .replace(
- /^(\n)?\s{0,}#{1,6}\s+| {0,}(\n)?\s{0,}#{0,} {0,}(\n)?\s{0,}$/gm,
- '$1$2$3'
- )
.replace(/([\*_]{1,3})(\S.*?\S{0,1})\1/g, '$2')
.replace(/([\*_]{1,3})(\S.*?\S{0,1})\1/g, '$2')
.replace(/(`{3,})(.*?)\1/gm, '$2')
.replace(/`(.+?)`/g, '$1')
- .replace(/\n{2,}/g, '\n\n');
+ .replace(/\n{2,}/g, '\n\n')
} catch (e) {
- console.error(e);
- return markdown;
+ console.error(e)
+ return markdown
}
- return output;
-};
+ return output
+}
// -----
-(async function () {
- const encoder = (str) => str.toLowerCase().split(/([^a-z]|[^\x00-\x7F])+/);
+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 before = content.substring(0, directMatchIdx).split(" ").slice(-h)
+ const after = content.substring(directMatchIdx + term.length, content.length - 1).split(" ").slice(0, h)
+ return (before.length == h ? `...${before.join(" ")}` : before.join(" ")) + `<span class="search-highlight">${term}</span>` + after.join(" ")
+ }
+
+ const tokenizedTerm = term.split(/\s+/).filter((t) => t !== '')
+ const splitText = content.split(/\s+/).filter((t) => t !== '')
+ const includesCheck = (token) =>
+ tokenizedTerm.some((term) =>
+ token.toLowerCase().startsWith(term.toLowerCase())
+ )
+
+ const occurrencesIndices = splitText.map(includesCheck)
+
+ // calculate best index
+ let bestSum = 0
+ let bestIndex = 0
+ for (
+ let i = 0;
+ i < Math.max(occurrencesIndices.length - highlightWindow, 0);
+ i++
+ ) {
+ const window = occurrencesIndices.slice(i, i + highlightWindow)
+ const windowSum = window.reduce((total, cur) => total + cur, 0)
+ if (windowSum >= bestSum) {
+ bestSum = windowSum
+ bestIndex = i
+ }
+ }
+
+ const startIndex = Math.max(bestIndex - highlightWindow, 0)
+ const endIndex = Math.min(
+ startIndex + 2 * highlightWindow,
+ splitText.length
+ )
+ const mappedText = splitText
+ .slice(startIndex, endIndex)
+ .map((token) => {
+ if (includesCheck(token)) {
+ return `<span class="search-highlight">${token}</span>`
+ }
+ return token
+ })
+ .join(' ')
+ .replaceAll('</span> <span class="search-highlight">', ' ')
+ return `${startIndex === 0 ? '' : '...'}${mappedText}${endIndex === splitText.length ? '' : '...'
+ }`
+};
+
+(async function() {
+ const encoder = (str) => str.toLowerCase().split(/([^a-z]|[^\x00-\x7F])+/)
const contentIndex = new FlexSearch.Document({
cache: true,
charset: 'latin:extra',
@@ -76,102 +129,56 @@
encode: encoder,
},
],
- });
+ })
- const { content } = await fetchData;
+ const { content } = await fetchData
for (const [key, value] of Object.entries(content)) {
contentIndex.add({
id: key,
title: value.title,
content: removeMarkdown(value.content),
- });
+ })
}
- const highlight = (content, term) => {
- const highlightWindow = 20;
- const tokenizedTerm = term.split(/\s+/).filter((t) => t !== '');
- const splitText = content.split(/\s+/).filter((t) => t !== '');
- const includesCheck = (token) =>
- tokenizedTerm.some((term) =>
- token.toLowerCase().startsWith(term.toLowerCase())
- );
-
- const occurrencesIndices = splitText.map(includesCheck);
-
- // calculate best index
- let bestSum = 0;
- let bestIndex = 0;
- for (
- let i = 0;
- i < Math.max(occurrencesIndices.length - highlightWindow, 0);
- i++
- ) {
- const window = occurrencesIndices.slice(i, i + highlightWindow);
- const windowSum = window.reduce((total, cur) => total + cur, 0);
- if (windowSum >= bestSum) {
- bestSum = windowSum;
- bestIndex = i;
- }
- }
-
- const startIndex = Math.max(bestIndex - highlightWindow, 0);
- const endIndex = Math.min(
- startIndex + 2 * highlightWindow,
- splitText.length
- );
- const mappedText = splitText
- .slice(startIndex, endIndex)
- .map((token) => {
- if (includesCheck(token)) {
- return `<span class="search-highlight">${token}</span>`;
- }
- return token;
- })
- .join(' ')
- .replaceAll('</span> <span class="search-highlight">', ' ');
- return `${startIndex === 0 ? '' : '...'}${mappedText}${
- endIndex === splitText.length ? '' : '...'
- }`;
- };
-
const resultToHTML = ({ url, title, content, term }) => {
- const text = removeMarkdown(content);
- const resultTitle = highlight(title, term);
- const resultText = highlight(text, term);
+ const text = removeMarkdown(content)
+ const resultTitle = highlight(title, term)
+ const resultText = highlight(text, term)
return `<button class="result-card" id="${url}">
<h3>${resultTitle}</h3>
<p>${resultText}</p>
- </button>`;
- };
+ </button>`
+ }
const redir = (id, term) => {
+ // SPA navigation
window.navigate(
new URL(
- `${BASE_URL.slice(0, -1)}${id}#:~:text=${encodeURIComponent(term)}/`
+ `${BASE_URL.replace(/\/$/g, "")}${id}#:~:text=${encodeURIComponent(term)}/`
),
'.singlePage'
- );
- closeSearch();
- };
+ )
+ closeSearch()
+ }
const formatForDisplay = (id) => ({
id,
url: id,
title: content[id].title,
content: content[id].content,
- });
+ })
- const source = document.getElementById('search-bar');
- const results = document.getElementById('results-container');
- let term;
+ const source = document.getElementById('search-bar')
+ const results = document.getElementById('results-container')
+ let term
source.addEventListener('keyup', (e) => {
if (e.key === 'Enter') {
- const anchor = document.getElementsByClassName('result-card')[0];
- redir(anchor.id, term);
+ const anchor = document.getElementsByClassName('result-card')[0]
+ redir(anchor.id, term)
}
- });
+ })
source.addEventListener('input', (e) => {
- term = e.target.value;
+ term = e.target.value
const searchResults = contentIndex.search(term, [
{
field: 'content',
@@ -181,24 +188,24 @@
field: 'title',
limit: 5,
},
- ]);
+ ])
const getByField = (field) => {
- const results = searchResults.filter((x) => x.field === field);
+ const results = searchResults.filter((x) => x.field === field)
if (results.length === 0) {
- return [];
+ return []
} else {
- return [...results[0].result];
+ return [...results[0].result]
}
- };
- const allIds = new Set([...getByField('title'), ...getByField('content')]);
- const finalResults = [...allIds].map(formatForDisplay);
+ }
+ const allIds = new Set([...getByField('title'), ...getByField('content')])
+ const finalResults = [...allIds].map(formatForDisplay)
// display
if (finalResults.length === 0) {
results.innerHTML = `<button class="result-card">
<h3>No results.</h3>
<p>Try another search term?</p>
- </button>`;
+ </button>`
} else {
results.innerHTML = finalResults
.map((result) =>
@@ -207,56 +214,56 @@
term,
})
)
- .join('\n');
- const anchors = document.getElementsByClassName('result-card');
- [...anchors].forEach((anchor) => {
- anchor.onclick = () => redir(anchor.id, term);
- });
+ .join('\n')
+ const anchors = [...document.getElementsByClassName('result-card')]
+ anchors.forEach((anchor) => {
+ anchor.onclick = () => redir(anchor.id, term)
+ })
}
- });
+ })
- const searchContainer = document.getElementById('search-container');
+ const searchContainer = document.getElementById('search-container')
function openSearch() {
if (
searchContainer.style.display === 'none' ||
searchContainer.style.display === ''
) {
- source.value = '';
- results.innerHTML = '';
- searchContainer.style.display = 'block';
- source.focus();
+ source.value = ''
+ results.innerHTML = ''
+ searchContainer.style.display = 'block'
+ source.focus()
} else {
- searchContainer.style.display = 'none';
+ searchContainer.style.display = 'none'
}
}
function closeSearch() {
- searchContainer.style.display = 'none';
+ searchContainer.style.display = 'none'
}
document.addEventListener('keydown', (event) => {
if (event.key === 'k' && (event.ctrlKey || event.metaKey)) {
- event.preventDefault();
- openSearch();
+ event.preventDefault()
+ openSearch()
}
if (event.key === 'Escape') {
- event.preventDefault();
- closeSearch();
+ event.preventDefault()
+ closeSearch()
}
- });
+ })
- const searchButton = document.getElementById('search-icon');
+ const searchButton = document.getElementById('search-icon')
searchButton.addEventListener('click', (evt) => {
- openSearch();
- });
+ openSearch()
+ })
searchButton.addEventListener('keydown', (evt) => {
- openSearch();
- });
+ openSearch()
+ })
searchContainer.addEventListener('click', (evt) => {
- closeSearch();
- });
+ closeSearch()
+ })
document.getElementById('search-space').addEventListener('click', (evt) => {
- evt.stopPropagation();
- });
-})();
+ evt.stopPropagation()
+ })
+})()
--
Gitblit v1.10.0