diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js
index 0cea31a..0349c60 100644
--- a/app/static/js/highlight.js
+++ b/app/static/js/highlight.js
@@ -1,4 +1,4 @@
-let isHighlight = true;
+let isHighlight = localStorage.getItem('highlightChecked') !== 'false'; // default to true
function cancelBtnHandler() {
cancelHighlighting();
@@ -22,62 +22,39 @@ function getWord() {
function highLight() {
if (!isHighlight) return;
- let articleContent = document.getElementById("article").innerText; //将原来的.innerText改为.innerHtml，使用innerText会把原文章中所包含的
标签去除，导致处理后的文章内容失去了原来的格式
+ let articleContent = document.getElementById("article").innerHTML; // innerHTML保留HTML标签来保持部分格式，且适配不同的浏览器
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未初始化的问题
- if(dictionaryWords != null){//增加一个判断，检查生词本里面是否为空，如果为空，allWords只添加选中的单词
- allWords = pickedWords.value + " " + dictionaryWords.value;
- }
- else{
- allWords = pickedWords.value + " ";
- }
- const list = allWords.split(" ");//将所有的生词放入一个list中，用于后续处理
+ let allWords = dictionaryWords === null ? pickedWords.value + " " : pickedWords.value + " " + dictionaryWords.value;
+ const list = allWords.split(" "); // 将所有的生词放入一个list中
+ let totalSet = new Set();
for (let i = 0; i < list.length; ++i) {
- list[i] = list[i].replace(/(^\s*)|(\s*$)/g, ""); //消除单词两边的空字符
- list[i] = list[i].replace('|', "");
- list[i] = list[i].replace('?', "");
- if (list[i] !== "" && "".indexOf(list[i]) === -1 && "".indexOf(list[i]) === -1) {
- //将文章中所有出现该单词word的地方改为："" + word + ""。 正则表达式RegExp()中，"\\b"代表单词边界匹配。
-
- //修改代码
- let articleContent_fb = articleContent; //文章副本
- 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"),"" + list[i] + "");
+ list[i] = list[i].replace(/(^\W*)|(\W*$)/g, ""); // 消除单词两边的非单词字符
+ if (list[i] != "" && !totalSet.has(list[i])) {
+ // 返回所有匹配单词的集合, 正则表达式RegExp()中, "\b"匹配一个单词的边界, g 表示全局匹配, i 表示对大小写不敏感。
+ let matches = new Set(articleContent.match(new RegExp("\\b" + list[i] + "\\b", "gi")));
+ if (matches.has("mark")) {
+ // 优先处理单词为 "mark" 的情况
+ totalSet = new Set(["mark", ...totalSet]);
}
+ totalSet = new Set([...totalSet, ...matches]);
}
}
+ // 删除所有的mark标签,防止标签发生嵌套
+ articleContent = articleContent.replace(/<(mark)[^>]*>/gi, "");
+ articleContent = articleContent.replace(/<(\/mark)[^>]*>/gi, "");
+ // 将文章中所有出现该单词word的地方改为："" + word + ""。
+ for (let word of totalSet) {
+ articleContent = articleContent.replace(new RegExp("\\b" + word + "\\b", "g"), "" + word + "");
+ }
document.getElementById("article").innerHTML = articleContent;
+ $('mark').css('padding', 0);
}
function cancelHighlighting() {
- 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] !== "") { //原来判断的代码中，替换的内容为“list[i]”这个字符串，这明显是错误的，我们需要替换的是list[i]里的内容
- articleContent = articleContent.replace(new RegExp(""+list[i]+"", "g"), list[i]);
- }
- }
- }
- if (dictionaryWords != null) {
- let list2 = pickedWords.value.split(" ");
- for (let i = 0; i < list2.length; ++i) {
- list2 = dictionaryWords.value.split(" ");
- 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]);
- }
- }
- }
+ let articleContent = document.getElementById("article").innerHTML;
+ articleContent = articleContent.replace(/<(mark)[^>]*>/gi, "");
+ articleContent = articleContent.replace(/<(\/mark)[^>]*>/gi, "");
document.getElementById("article").innerHTML = articleContent;
}
@@ -97,6 +74,7 @@ function toggleHighlighting() {
isHighlight = true;
highLight();
}
+ localStorage.setItem('highlightChecked', isHighlight);
}
-showBtnHandler();
+showBtnHandler();
\ No newline at end of file
diff --git a/app/test/test_bug551_XieShangHai.py b/app/test/test_bug551_XieShangHai.py
new file mode 100644
index 0000000..3e0783b
--- /dev/null
+++ b/app/test/test_bug551_XieShangHai.py
@@ -0,0 +1,30 @@
+from selenium.webdriver.common.action_chains import ActionChains
+import time
+from helper import signup
+
+def test_highlight(driver, URL):
+ try:
+ # 打开网页
+ driver.maximize_window()
+ driver.get(URL)
+
+ # 注册
+ time.sleep(1)
+ signup(URL, driver)
+ time.sleep(2)
+
+ # 选中单词（移动鼠标到起点位置、按下鼠标左键、拖动鼠标到结束位置、释放鼠标左键、执行操作链）
+ article = driver.find_element_by_id("article")
+ actions = ActionChains(driver)
+ actions.move_to_element(article).click_and_hold().move_by_offset(450,60).release().perform()
+ time.sleep(1)
+
+ # 判断所有高亮单词是否有间隔
+ marks = driver.find_elements_by_tag_name("mark")
+ for mark in marks:
+ assert mark.value_of_css_property("padding") == '0px'
+ time.sleep(5)
+ finally:
+ # 测试结束后关闭浏览器
+ driver.quit()
+
\ No newline at end of file