gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix matching of "b" in the note autcomplete highlighter

Browse Source
This commit is contained in:
azivner 2018-11-26 22:35:19 +01:00
parent b3aa0ba47c
commit 61e1427b83
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/services/note_cache.js
View File

@ -38,7 +38,8 @@ async function load() {
function highlightResults(results, allTokens) { function highlightResults(results, allTokens) {
// we remove < signs because they can cause trouble in matching and overwriting existing highlighted chunks // we remove < signs because they can cause trouble in matching and overwriting existing highlighted chunks
// which would make the resulting HTML string invalid. // which would make the resulting HTML string invalid.
allTokens = allTokens.map(token => token.replace('/</g', '')); // { and } are used for marking <b> and </b> tag (to avoid matches on single 'b' character)
allTokens = allTokens.map(token => token.replace('/[<\{\}]/g', ''));
// sort by the longest so we first highlight longest matches // sort by the longest so we first highlight longest matches
allTokens.sort((a, b) => a.length > b.length ? -1 : 1); allTokens.sort((a, b) => a.length > b.length ? -1 : 1);
@ -51,9 +52,15 @@ function highlightResults(results, allTokens) {
const tokenRegex = new RegExp("(" + utils.escapeRegExp(token) + ")", "gi"); const tokenRegex = new RegExp("(" + utils.escapeRegExp(token) + ")", "gi");
for (const result of results) { for (const result of results) {
result.highlighted = result.highlighted.replace(tokenRegex, "<b>$1</b>"); result.highlighted = result.highlighted.replace(tokenRegex, "{$1}");
} }
} }
for (const result of results) {
result.highlighted = result.highlighted
.replace(/{/g, "<b>")
.replace(/}/g, "</b>");
}
} }
function findNotes(query) { function findNotes(query) {