revert 41e061cd2e

revert revert 48f440c1b5

Bug545-huanghuiling

app/static/js/fillword.js

@@ -9,8 +9,12 @@ function fillInWord() {
     let word = getWord();
     if (isRead) Reader.read(word, inputSlider.value);
     if (!isChoose) return;
-    const element = document.getElementById("selected-words");
+    let element = document.getElementById("selected-words");
-    element.value = element.value + " " + word;
+    let index = (String)(element.value).indexOf(word);
+    localStorage.setItem("nowWord",element.value);
+    if(index === -1){
+        element.value = element.value + " " + word;
+    }
 }
 
 document.getElementById("text-content").addEventListener("click", fillInWord, false);

app/static/js/highlight.js

@@ -33,6 +33,22 @@ function highLight() {
         allWords = pickedWords.value + " ";
     }
     const list = allWords.split(" ");//将所有的生词放入一个list中，用于后续处理
+    //判断获取的单词不能为空
+    if(word !== null && word !== "" && word !== " "){
+        let articleContent_fb2 = articleContent;
+        if(localStorage.getItem("nowWord").indexOf(word) !== -1){
+            while(articleContent_fb2.toLowerCase().indexOf(word.toLowerCase()) !== -1){
+                // 找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。
+                const index = articleContent_fb2.toLowerCase().indexOf(word.toLowerCase());
+                word = articleContent_fb2.substring(index, index + word.length);
+                articleContent_fb2 = articleContent_fb2.substring(index + word.length);    // 使用副本中list[i]之后的子串替换掉副本
+                articleContent = articleContent.replace(new RegExp("<mark>"+word+"</mark>", "g"), word)
+            }
+            pickedWords.value = localStorage.getItem("nowWord").replace(word,"");
+            document.getElementById("article").innerHTML = articleContent;
+            return;
+        }
+    }
     for (let i = 0; i < list.length; ++i) {
         list[i] = list[i].replace(/(^\s*)|(\s*$)/g, ""); //消除单词两边的空字符
         list[i] = list[i].replace('|', "");