Merge pull request 'Bug545-HuangHuiLing' (#122) from Bug545-HuangHuiLing into Alpha-snapshot20230621

Reviewed-on: mrlan/EnglishPal#122

app/static/js/fillword.js

@@ -1,4 +1,3 @@
-// initialize from localStorage
 let isRead = localStorage.getItem('readChecked') !== 'false';  // default to true
 let isChoose = localStorage.getItem('chooseChecked') !== 'false';
 
@@ -11,6 +10,7 @@ function fillInWord() {
     if (isRead) Reader.read(word, inputSlider.value);
     if (!isChoose) return;
     const element = document.getElementById("selected-words");
+    localStorage.setItem('nowWords', element.value);
     element.value = element.value + " " + word;
     localStorage.setItem('selectedWords', element.value);
 }
@@ -38,3 +38,4 @@ function onChooseClick() {
 if (performance.getEntriesByType("navigation")[0].type == "reload") {
     Reader.stopRead();
 }
+

app/static/js/highlight.js

@@ -22,39 +22,46 @@ function getWord() {
 
 function highLight() {
     if (!isHighlight) return;
+    let word = (getWord() + "").trim();
     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 = dictionaryWords === null ? pickedWords.value + " " : pickedWords.value + " " + dictionaryWords.value;
     const list = allWords.split(" "); // 将所有的生词放入一个list中
+    if(word !== null && word !== "" && word !== " "){
+        let articleContent_fb2 = articleContent;
+        if(localStorage.getItem("nowWords").indexOf(word) !== -1 || localStorage.getItem("nowWords").indexOf(word.toLowerCase()) !== -1){
+            articleContent = articleContent.replace(new RegExp('<span class="highlighted">' + word + '</span>', "gi"), word);
+            pickedWords.value = localStorage.getItem("nowWords").replace(word,"");
+            document.getElementById("article").innerHTML = articleContent;
+            return;
+        }
+    }
     let totalSet = new Set();
     for (let i = 0; i < list.length; ++i) {
         list[i] = list[i].replace(/(^\W*)|(\W*$)/g, ""); // 消除单词两边的非单词字符
+        list[i] = list[i].replace('|', "");
+        list[i] = list[i].replace('?', "");
         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标签,防止标签发生嵌套
+    // 删除所有的"<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>"。
     for (let word of totalSet) {
         articleContent = articleContent.replace(new RegExp("\\b" + word + "\\b", "g"), "<span class='highlighted'>" + word + "</span>");
     }
     document.getElementById("article").innerHTML = articleContent;
-
 }
 
 function cancelHighlighting() {
     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;
 }
 

app/templates/userpage_get.html

@@ -291,7 +291,7 @@
 </body>
 <style>
     mark {
-        color: #{{ yml['highlight']['color'] }};
+        color: red;
         background-color: rgba(0, 0, 0, 0);
     }
 </style>

app/test/test_bug544_tangxinyuan.py

@@ -1,5 +1,7 @@
 import random
 import string
+import time
+
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC

app/test/test_bug545_HuangHuiLing.py

@@ -0,0 +1,44 @@
+import random
+import string
+import time
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.common.action_chains import ActionChains
+
+from helper import signup
+
+def has_punctuation(s):
+    return any(c in string.punctuation for c in s)
+
+def select_one(driver):
+    elem = driver.find_element(By.ID, 'article')
+    essay_content = elem.text
+    valid_word = random.choice([word for word in essay_content.split() if len(word) >= 6 and not has_punctuation(
+        word) and 'font>' not in word and 'br>' not in word and 'p>' not in word])
+    driver.find_element(By.ID, 'selected-words').send_keys(valid_word)
+    driver.find_element(By.ID, 'article').click()
+    return valid_word
+
+def select_two(driver):
+    word = driver.find_element(By.CLASS_NAME, 'highlighted')
+
+    # 创建ActionChains对象
+    actions = ActionChains(driver)
+    actions.move_to_element(word)
+
+    # 模拟鼠标按下并拖动以选择文本
+    actions.double_click()
+    actions.perform()
+
+
+def test_selected_second_word(driver, URL):
+    try:
+        signup(URL, driver)
+        selected_words = select_one(driver);
+        assert selected_words.strip() != "", "选中的单词被放置框中"
+        select_two(driver)
+        selected_second_words = driver.find_element(By.ID, 'selected-words').get_attribute('value')
+        assert selected_second_words.strip() == "", "选中的单词被删除"
+    finally:
+        driver.quit()