forked from mrlan/EnglishPal
Merge pull request 'Bug412-JiangLetian' (#39) from Bug412-JiangLetian into master
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/39
commit
9927515b11
|
@ -28,9 +28,10 @@ function highLight() {
|
|||
if (sel_word1 != null) {
|
||||
const list = sel_word1.value.split(" ");
|
||||
for (let i = 0; i < list.length; ++i) {
|
||||
list[i] = list[i].replace(/(^\s*)|(\s*$)/g, "");
|
||||
list[i] = list[i].replace(/(^\s*)|(\s*$)/g, ""); //消除字符串两边空字符
|
||||
if (list[i] !== "" && "<mark>".indexOf(list[i]) === -1 && "</mark>".indexOf(list[i]) === -1) {
|
||||
txt = txt.replace(new RegExp(list[i], "g"), "<mark>" + list[i] + "</mark>");
|
||||
//将正则表达式进行修改 表示搜索的是两端带有空格的list[i] 那么搜索的便为一个完整单词 然后在mark标签的前后各加了一个空格对其进行替换
|
||||
txt = txt.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " <mark>" + list[i] + "</mark> ");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -39,7 +40,8 @@ function highLight() {
|
|||
for (let i = 0; i < list2.length; ++i) {
|
||||
list2[i] = list2[i].replace(/(^\s*)|(\s*$)/g, "");
|
||||
if (list2[i] !== "" && "<mark>".indexOf(list2[i]) === -1 && "</mark>".indexOf(list2[i]) === -1) {
|
||||
txt = txt.replace(new RegExp(list2[i], "g"), "<mark>" + list2[i] + "</mark>");
|
||||
//将正则表达式进行修改 表示搜索的是两端带有空格的list2[i] 那么搜索的便为一个完整单词 然后在mark标签的前后各加了一个空格对其进行替换
|
||||
txt = txt.replace(new RegExp("\\s"+list2[i]+"\\s", "g"), " <mark>" + list2[i] + "</mark> ");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -91,4 +93,4 @@ function ChangeHighlight() {
|
|||
}
|
||||
}
|
||||
|
||||
showBtnHandler();
|
||||
showBtnHandler();
|
||||
|
|
Loading…
Reference in New Issue