huangjihao
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests Activity

再次选择高亮单词，由于标记高亮单词的标签由<mark>改为了<span>，所以在取消单词高亮状态时将标签均改为了<span>，替换时的代码也冗余了，所以也进行了一部分删除。

Bug545-HuangHuiLing
1994836463@qq.com 2024-05-26 11:22:20 +08:00
parent 85a3a9ce6a
commit 9537024339
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/static/js/highlight.js
View File

@ -30,15 +30,9 @@ function highLight() {
const list = allWords.split(" "); // 将所有的生词放入一个list中 const list = allWords.split(" "); // 将所有的生词放入一个list中
if(word !== null && word !== "" && word !== " "){ if(word !== null && word !== "" && word !== " "){
let articleContent_fb2 = articleContent; let articleContent_fb2 = articleContent;
if(localStorage.getItem("nowWord").indexOf(word) !== -1){ if(localStorage.getItem("nowWords").indexOf(word) !== -1 || localStorage.getItem("nowWords").indexOf(word.toLowerCase()) !== -1){
while(articleContent_fb2.toLowerCase().indexOf(word.toLowerCase()) !== -1){ articleContent = articleContent.replace(new RegExp('<span class="highlighted">' + word + '</span>', "gi"), word);
// 找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。 pickedWords.value = localStorage.getItem("nowWords").replace(word,"");
const index = articleContent_fb2.toLowerCase().indexOf(word.toLowerCase());
word = articleContent_fb2.substring(index, index + word.length);
articleContent_fb2 = articleContent_fb2.substring(index + word.length); // 使用副本中list[i]之后的子串替换掉副本
articleContent = articleContent.replace(new RegExp("<mark>"+word+"</mark>", "g"), word)
}
pickedWords.value = localStorage.getItem("nowWord").replace(word,"");
document.getElementById("article").innerHTML = articleContent; document.getElementById("article").innerHTML = articleContent;
return; return;
} }
@ -48,39 +42,26 @@ function highLight() {
list[i] = list[i].replace(/(^\W*)|(\W*$)/g, ""); // 消除单词两边的非单词字符 list[i] = list[i].replace(/(^\W*)|(\W*$)/g, ""); // 消除单词两边的非单词字符
list[i] = list[i].replace('|', ""); list[i] = list[i].replace('|', "");
list[i] = list[i].replace('?', ""); list[i] = list[i].replace('?', "");
if (list[i] != "" && !totalSet.has(list[i]) && "<mark>".indexOf(list[i]) === -1 && "</mark>".indexOf(list[i]) === -1) { if (list[i] != "" && !totalSet.has(list[i])) {
// 返回所有匹配单词的集合, 正则表达式RegExp()中, "\b"匹配一个单词的边界, g 表示全局匹配, i 表示对大小写不敏感。 // 返回所有匹配单词的集合, 正则表达式RegExp()中, "\b"匹配一个单词的边界, g 表示全局匹配, i 表示对大小写不敏感。
let matches = new Set(articleContent.match(new RegExp("\\b" + list[i] + "\\b", "gi"))); let matches = new Set(articleContent.match(new RegExp("\\b" + list[i] + "\\b", "gi")));
let articleContent_fb = articleContent; //文章副本
if (matches.has("mark")) {
// 优先处理单词为 "mark" 的情况
totalSet = new Set(["mark", ...totalSet]);
}
while(articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()) !== -1 && list[i]!=""){
//找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。
const index = articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase());
list[i] = articleContent_fb.substring(index, index + list[i].length);
articleContent_fb = articleContent_fb.substring(index + list[i].length); // 使用副本中list[i]之后的子串替换掉副本
articleContent = articleContent.replace(new RegExp("\\b"+list[i]+"\\b","g"),"<mark>" + list[i] + "</mark>");
}
totalSet = new Set([...totalSet, ...matches]); totalSet = new Set([...totalSet, ...matches]);
} }
} }
// 删除所有的mark标签,防止标签发生嵌套 // 删除所有的"<span class='highlighted'>"标签,防止标签发生嵌套
articleContent = articleContent.replace(/<(mark)[^>]*>/gi, ""); articleContent = articleContent.replace(new RegExp('<span class="highlighted">',"gi"), "")
articleContent = articleContent.replace(/<(\/mark)[^>]*>/gi, ""); articleContent = articleContent.replace(new RegExp("</span>","gi"), "");
// 将文章中所有出现该单词word的地方改为："<span class='highlighted'>" + word + "</span>"。 // 将文章中所有出现该单词word的地方改为："<span class='highlighted'>" + word + "</span>"。
for (let word of totalSet) { for (let word of totalSet) {
articleContent = articleContent.replace(new RegExp("\\b" + word + "\\b", "g"), "<span class='highlighted'>" + word + "</span>"); articleContent = articleContent.replace(new RegExp("\\b" + word + "\\b", "g"), "<span class='highlighted'>" + word + "</span>");
} }
document.getElementById("article").innerHTML = articleContent; document.getElementById("article").innerHTML = articleContent;
} }
function cancelHighlighting() { function cancelHighlighting() {
let articleContent = document.getElementById("article").innerHTML; let articleContent = document.getElementById("article").innerHTML;
articleContent = articleContent.replace(/<(mark)[^>]*>/gi, ""); articleContent = articleContent.replace(new RegExp('<span class="highlighted">',"gi"), "")
articleContent = articleContent.replace(/<(\/mark)[^>]*>/gi, ""); articleContent = articleContent.replace(new RegExp("</span>","gi"), "");
document.getElementById("article").innerHTML = articleContent; document.getElementById("article").innerHTML = articleContent;
} }