bug fixed

neeeeecka · Aug 1, 2020 · 1ac9610 · 1ac9610
1 parent 8a03d54
commit 1ac9610
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/background.js b/background.js
@@ -144,16 +144,18 @@ chrome.tabs.query({ active: true, currentWindow: true }, function(tabs) {
   chrome.tabs.sendMessage(tabs[0].id, { action: "getBannedSlogans" }, function(
     response
   ) {
-    let resultContent = "";
-
-    if (response.length == 0) {
-      resultContent = fullDiv("Hooray, no banned words!");
-    } else {
-      response.forEach((slogan, i) => {
-        resultContent += span(span(i + 1) + span(slogan));
-      });
+    if (response) {
+      let resultContent = "";
+
+      if (response.length == 0) {
+        resultContent = fullDiv("Hooray, no banned words!");
+      } else {
+        response.forEach((slogan, i) => {
+          resultContent += span(span(i + 1) + span(slogan));
+        });
+      }
+
+      bannedSlogansList.innerHTML = resultContent;
     }
-
-    bannedSlogansList.innerHTML = resultContent;
   });
 });
diff --git a/content.js b/content.js
@@ -77,15 +77,16 @@ function startScan() {
         let doc = domParser.parseFromString(text["*"], "text/html");
         parseWikiNodes(doc);
         checkNodeRecursively(body);
-        const observer = new MutationObserver(callback);
-        observer.observe(body, {
-          childList: true,
-          subtree: true
-        });
       });
   } else {
     checkNodeRecursively(body);
   }
+  const observer = new MutationObserver(callback);
+  observer.observe(body, {
+    childList: true,
+    subtree: true
+  });
+
   function checkNode(startNode) {
     if (startNode.nodeType == Node.TEXT_NODE) {
       const value = startNode.nodeValue.toLowerCase();