Skip to content

Commit a115b14

Browse files
committed
fix highlighting search results with regexp characters in fulltext string, closes #4665
1 parent 2d19f07 commit a115b14

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/public/app/services/note_list_renderer.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import froca from "./froca.js";
44
import attributeRenderer from "./attribute_renderer.js";
55
import libraryLoader from "./library_loader.js";
66
import treeService from "./tree.js";
7+
import utils from "./utils.js";
78

89
const TPL = `
910
<div class="note-list">
@@ -215,7 +216,11 @@ class NoteListRenderer {
215216
if (highlightedTokens.length > 0) {
216217
await libraryLoader.requireLibrary(libraryLoader.MARKJS);
217218

218-
this.highlightRegex = new RegExp(highlightedTokens.join("|"), 'gi');
219+
const regex = highlightedTokens
220+
.map(token => utils.escapeRegExp(token))
221+
.join("|");
222+
223+
this.highlightRegex = new RegExp(regex, 'gi');
219224
} else {
220225
this.highlightRegex = null;
221226
}

0 commit comments

Comments
 (0)