fix: 修复 markdown bug 只能删除一个的问题

LIlGG · Jul 23, 2021 · ef74afe · ef74afe
1 parent b2b55c6
commit ef74afe
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 28 deletions.
diff --git a/dist/halo-comment.js b/dist/halo-comment.js
@@ -15265,22 +15265,35 @@ function renderedEmojiHtml(html) {
 
 function removeNotEmoji(doc) {
   let smilies = doc.getElementsByClassName("smilies");
-  loopSearchEmoji(smilies, "tieba", node => {
-    let alt = node.getAttribute('alt');
-    let textNode = document.createTextNode(alt);
-    node.parentNode.replaceChild(textNode, node);
-  });
-  return doc;
-}
+  let skip = true;
 
-function loopSearchEmoji(nodeList, type, callback) {
-  for (let i = 0; i < nodeList.length; i++) {
-    var name = nodeList[i].dataset.icon;
+  for (let i = 0; i < smilies.length; i++) {
+    let name = smilies[i].dataset.icon;
 
-    if (!findEmoji(type, name)) {
-      callback(nodeList[i]);
+    if (!findEmoji("tieba", name)) {
+      skip = false;
+      break;
     }
   }
+
+  if (skip) {
+    return doc;
+  }
+
+  var firstNode = smilies[0];
+  var name = firstNode.dataset.icon;
+
+  if (!findEmoji("tieba", name)) {
+    removeNode(firstNode);
+  }
+
+  return removeNotEmoji(doc);
+}
+
+function removeNode(node) {
+  let alt = node.getAttribute('alt');
+  let textNode = document.createTextNode(alt);
+  node.parentNode.replaceChild(textNode, node);
 }
 /**
  * 根据条件查找表情

diff --git a/dist/halo-comment.js.map b/dist/halo-comment.js.map
diff --git a/dist/halo-comment.min.js b/dist/halo-comment.min.js
diff --git a/dist/halo-comment.min.js.map b/dist/halo-comment.min.js.map
diff --git a/src/utils/emojiutil.js b/src/utils/emojiutil.js
@@ -30,23 +30,35 @@ export function renderedEmojiHtml(html) {
  */
 function removeNotEmoji(doc) {
     let smilies = doc.getElementsByClassName("smilies");
-    loopSearchEmoji(smilies, "tieba", (node) => {
-        let alt = node.getAttribute('alt');
-        let textNode = document.createTextNode(alt);
+    let skip = true;
 
-        node.parentNode.replaceChild(textNode, node);
-    });
-    return doc;
-}
-
-function loopSearchEmoji(nodeList, type, callback) {
-    for(let i = 0; i < nodeList.length; i++) {
-        var name = nodeList[i].dataset.icon;
+    for (let i = 0; i < smilies.length; i++) {
+        let name = smilies[i].dataset.icon;
 
-        if (!findEmoji(type, name)) {
-            callback(nodeList[i])
+        if (!findEmoji("tieba", name)) {
+            skip = false;
+            break;
         }
     }
+
+    if (skip) {
+        return doc;
+    }
+
+    var firstNode = smilies[0];
+    var name = firstNode.dataset.icon;
+
+    if (!findEmoji("tieba", name)) {
+        removeNode(firstNode)
+    }
+
+    return removeNotEmoji(doc);
+}
+
+function removeNode(node) {
+    let alt = node.getAttribute('alt');
+    let textNode = document.createTextNode(alt);
+    node.parentNode.replaceChild(textNode, node);
 }
 
 /**