self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Mobile: Fixes #1082: Highlight correct keywords when doing a search

Browse Source
This commit is contained in:
Laurent Cozic
2018-12-29 18:24:02 +01:00
parent 5a00214fd2
commit f308fe71f9
4 changed files with 63 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ReactNativeClient/lib/MdToHtml.js
View File

@ -7,7 +7,7 @@ const { shim } = require('lib/shim.js');
const { _ } = require('lib/locale');
const md5 = require('md5');
const MdToHtml_Katex = require('lib/MdToHtml_Katex');
const { pregQuote } = require('lib/string-utils.js');
const StringUtils = require('lib/string-utils.js');
class MdToHtml {
@ -415,22 +415,7 @@ class MdToHtml {
}
applyHighlightedKeywords_(body, keywords) {
for (let i = 0; i < keywords.length; i++) {
const k = keywords[i];
let regexString = '';
if (k.type === 'regex') {
regexString = k.value;
} else {
regexString = pregQuote(k);
}
const re = new RegExp('(^|\n|\b)(' + regexString + ')(\n|\b|$)', 'gi');
body = body.replace(re, '$1<span class="highlighted-keyword">$2</span>$3');
}
return body;
return StringUtils.surroundKeywords(keywords, body, '<span class="highlighted-keyword">', '</span>');
}
render(body, style, options = null) {