|
|
|
|
@ -22,11 +22,17 @@ function getWord() {
|
|
|
|
|
|
|
|
|
|
function highLight() {
|
|
|
|
|
if (!isHighlight) return;
|
|
|
|
|
let articleContent = document.getElementById("article").innerText;
|
|
|
|
|
let articleContent = document.getElementById("article").innerText; //将原来的.innerText改为.innerHtml，使用innerText会把原文章中所包含的<br>标签去除，导致处理后的文章内容失去了原来的格式
|
|
|
|
|
let pickedWords = document.getElementById("selected-words"); // words picked to the text area
|
|
|
|
|
let dictionaryWords = document.getElementById("selected-words2"); // words appearing in the user's new words list
|
|
|
|
|
let allWords = pickedWords.value + " " + dictionaryWords.value;
|
|
|
|
|
const list = allWords.split(" ");
|
|
|
|
|
let allWords = ""; //初始化allWords的值，避免进入判断后编译器认为allWords未初始化的问题
|
|
|
|
|
if(dictionaryWords != null){//增加一个判断，检查生词本里面是否为空，如果为空，allWords只添加选中的单词
|
|
|
|
|
allWords = pickedWords.value + " " + dictionaryWords.value;
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
allWords = pickedWords.value + " ";
|
|
|
|
|
}
|
|
|
|
|
const list = allWords.split(" ");//将所有的生词放入一个list中，用于后续处理
|
|
|
|
|
for (let i = 0; i < list.length; ++i) {
|
|
|
|
|
list[i] = list[i].replace(/(^\s*)|(\s*$)/g, ""); //消除单词两边的空字符
|
|
|
|
|
list[i] = list[i].replace('|', "");
|
|
|
|
|
@ -40,15 +46,15 @@ function highLight() {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function cancelHighlighting() {
|
|
|
|
|
let articleContent = document.getElementById("article").innerText;
|
|
|
|
|
let articleContent = document.getElementById("article").innerText;//将原来的.innerText改为.innerHtml，原因同上
|
|
|
|
|
let pickedWords = document.getElementById("selected-words");
|
|
|
|
|
const dictionaryWords = document.getElementById("selected-words2");
|
|
|
|
|
const list = pickedWords.value.split(" ");
|
|
|
|
|
if (pickedWords != null) {
|
|
|
|
|
for (let i = 0; i < list.length; ++i) {
|
|
|
|
|
list[i] = list[i].replace(/(^\s*)|(\s*$)/g, "");
|
|
|
|
|
if (list[i] !== "") {
|
|
|
|
|
articleContent = articleContent.replace("<mark>" + list[i] + "</mark>", "list[i]");
|
|
|
|
|
if (list[i] !== "") { //原来判断的代码中，替换的内容为“list[i]”这个字符串，这明显是错误的，我们需要替换的是list[i]里的内容
|
|
|
|
|
articleContent = articleContent.replace(new RegExp("<mark>"+list[i]+"</mark>", "g"), list[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -57,8 +63,8 @@ function cancelHighlighting() {
|
|
|
|
|
for (let i = 0; i < list2.length; ++i) {
|
|
|
|
|
list2 = dictionaryWords.value.split(" ");
|
|
|
|
|
list2[i] = list2[i].replace(/(^\s*)|(\s*$)/g, "");
|
|
|
|
|
if (list2[i] !== "") {
|
|
|
|
|
articleContent = articleContent.replace("<mark>" + list[i] + "</mark>", "list[i]");
|
|
|
|
|
if (list2[i] !== "") { //原来代码中，替换的内容为“list[i]”这个字符串，这明显是错误的，我们需要替换的是list[i]里的内容
|
|
|
|
|
articleContent = articleContent.replace(new RegExp("<mark>"+list2[i]+"</mark>", "g"), list2[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Hui Lan
unknown