gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

small refactorings

Browse Source
This commit is contained in:
zadam 2020-08-30 23:19:55 +02:00
parent b793f8cb88
commit 5fd58def11
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/services/search/expressions/note_cache_flat_text.js
View File

@ -87,14 +87,9 @@ class NoteCacheFlatTextExp extends Expression {
if (note.type.includes(token) || note.mime.includes(token)) { if (note.type.includes(token) || note.mime.includes(token)) {
foundAttrTokens.push(token); foundAttrTokens.push(token);
} }
}
for (const attribute of note.ownedAttributes) { for (const attribute of note.ownedAttributes) {
const lcName = attribute.name.toLowerCase(); if (attribute.name.includes(token) || attribute.value.includes(token)) {
const lcValue = attribute.value.toLowerCase();
for (const token of this.tokens) {
if (lcName.includes(token) || lcValue.includes(token)) {
foundAttrTokens.push(token); foundAttrTokens.push(token);
} }
} }

2
src/services/search/services/search.js
View File

@ -133,6 +133,8 @@ function searchNotesForAutocomplete(query) {
} }
function highlightSearchResults(searchResults, highlightedTokens) { function highlightSearchResults(searchResults, highlightedTokens) {
highlightedTokens = Array.from(new Set(highlightedTokens));
// 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.
// { and } are used for marking <b> and </b> tag (to avoid matches on single 'b' character) // { and } are used for marking <b> and </b> tag (to avoid matches on single 'b' character)