diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js
index 5ec9663..17cd2ad 100644
--- a/app/static/js/highlight.js
+++ b/app/static/js/highlight.js
@@ -23,6 +23,8 @@ function getWord() {
function highLight() {
if (!isHighlight) return;
let articleContent = document.getElementById("article").innerText; //将原来的.innerText改为.innerHtml,使用innerText会把原文章中所包含的 标签去除,导致处理后的文章内容失去了原来的格式
+ let articleTitle = document.getElementById("article_title").innerText;//获取文章标题对象的引用
+ let articleQuestion = document.getElementById("question").innerText;//获取文章问题对象的引用
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 = ""; //初始化allWords的值,避免进入判断后编译器认为allWords未初始化的问题
@@ -40,13 +42,19 @@ function highLight() {
if (list[i] !== "" && "".indexOf(list[i]) === -1 && "".indexOf(list[i]) === -1) {
//将文章中所有出现该单词word的地方改为:" " + word + " "。 正则表达式RegExp()中,"\\s"代表单词前后必须要有空格,以防止只对单词中的部分字符高亮的情况出现。
articleContent = articleContent.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " " + list[i] + " ");
+ articleTitle = articleTitle.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " " + list[i] + " ");
+ articleQuestion = articleQuestion.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " " + list[i] + " ");
}
}
document.getElementById("article").innerHTML = articleContent;
+ document.getElementById("article_title").innerHTML = articleTitle;
+ document.getElementById("question").innerHTML = articleQuestion;
}
function cancelHighlighting() {
let articleContent = document.getElementById("article").innerText;//将原来的.innerText改为.innerHtml,原因同上
+ let articleTitle = document.getElementById("article_title").innerText;//获取文章标题对象的引用
+ let articleQuestion = document.getElementById("question").innerText;//获取文章问题对象的引用
let pickedWords = document.getElementById("selected-words");
const dictionaryWords = document.getElementById("selected-words2");
const list = pickedWords.value.split(" ");
@@ -55,6 +63,8 @@ function cancelHighlighting() {
list[i] = list[i].replace(/(^\s*)|(\s*$)/g, "");
if (list[i] !== "") { //原来判断的代码中,替换的内容为“list[i]”这个字符串,这明显是错误的,我们需要替换的是list[i]里的内容
articleContent = articleContent.replace(new RegExp(""+list[i]+"", "g"), list[i]);
+ articleTitle = articleTitle.replace(new RegExp(""+list[i]+"", "g"), list[i]);
+ articleQuestion = articleQuestion.replace(new RegExp(""+list[i]+"", "g"), list[i]);
}
}
}
@@ -65,10 +75,14 @@ function cancelHighlighting() {
list2[i] = list2[i].replace(/(^\s*)|(\s*$)/g, "");
if (list2[i] !== "") { //原来代码中,替换的内容为“list[i]”这个字符串,这明显是错误的,我们需要替换的是list[i]里的内容
articleContent = articleContent.replace(new RegExp(""+list2[i]+"", "g"), list2[i]);
+ articleTitle = articleTitle.replace(new RegExp(""+list2[i]+"", "g"), list2[i]);
+ articleQuestion = articleQuestion.replace(new RegExp(""+list2[i]+"", "g"), list2[i]);
}
}
}
document.getElementById("article").innerHTML = articleContent;
+ document.getElementById("article_title").innerHTML = articleTitle;
+ document.getElementById("question").innerHTML = articleQuestion;
}
function fillInWord() {
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index b5e16aa..59e6ee1 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -58,10 +58,10 @@
According to your word list, your level is {{ today_article["user_level"] }} and we have chosen an article with a difficulty level of {{ today_article["text_level"] }} for you.