From e10dbf9d67114e36e77bb773b631435844b3655c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E8=B1=AA?= <1594799762@qq.com>
Date: Sun, 29 Jan 2023 12:48:52 +0800
Subject: [PATCH] Bug507-WuWenZhuo (#70)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
### 修复了生词簿为空时，双击文章单词无法高亮的问题
通过增加一个判断，判断生词簿为空时，不把生词簿的内容进行处理，仅处理选中单词。
### 修复了生词簿为空时，取消高亮后，导致文章格式混乱的问题
原代码中，从数据库提取文章放到网页上时，使用的是.innerText的方法，导致原文章里包含的
标签丢失，导致文章格式混乱的问题。
Co-authored-by: unknown
Co-authored-by: Hui Lan
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/70
Co-authored-by: 王志豪 <1594799762@qq.com>
Co-committed-by: 王志豪 <1594799762@qq.com>
---
README.md | 3 +++
app/static/js/highlight.js | 22 ++++++++++++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index fb70948..c12fc0b 100644
--- a/README.md
+++ b/README.md
@@ -191,4 +191,7 @@ Bug report: http://118.25.96.118/bugzilla/show_bug.cgi?id=215
Bug report:http://118.25.96.118/bugzilla/show_bug.cgi?id=489
+=======
+实验3，添加我的组名：WuWenZhuo
+
*Last modified on 2021-10-17*
\ No newline at end of file
diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js
index 7b3cab2..5ec9663 100644
--- a/app/static/js/highlight.js
+++ b/app/static/js/highlight.js
@@ -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会把原文章中所包含的
标签去除，导致处理后的文章内容失去了原来的格式
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("" + list[i] + "", "list[i]");
+ if (list[i] !== "") { //原来判断的代码中，替换的内容为“list[i]”这个字符串，这明显是错误的，我们需要替换的是list[i]里的内容
+ articleContent = articleContent.replace(new RegExp(""+list[i]+"", "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("" + list[i] + "", "list[i]");
+ if (list2[i] !== "") { //原来代码中，替换的内容为“list[i]”这个字符串，这明显是错误的，我们需要替换的是list[i]里的内容
+ articleContent = articleContent.replace(new RegExp(""+list2[i]+"", "g"), list2[i]);
}
}
}