rollback exception

Author: ttop32

src/contentScript.js

@@ -70,7 +70,9 @@ var listenText = "";
     injectGoogleDocAnnotation(); //check google doc and add annotation env var
     loadDestructor(); //remove previous tooltip script
     await getSetting(); //load setting
-    checkExcludeUrl(); //check url is excluded or not in the whitelist
+    if(checkExcludeUrl()) {
+      return;
+    }
     await dom_util.waitJquery(); //wait jquery load
     detectPDF(); //check current page is pdf
     checkVideo(); // check  video  site for subtitle
@@ -83,12 +85,7 @@ var listenText = "";
     startMouseoverDetector(); // start current mouseover text detector
     startTextSelectDetector(); // start current text select detector
   } catch (error) {
-    if (error instanceof util.TooltipUrlExcludeError) {
-      // Do nothing
-      // console.log(error);      
-    } else {
-      console.log(error);
-    }
+    console.log(error);
   }
 })();
 
@@ -819,7 +816,7 @@ function checkExcludeUrl() {
   var isExcludeBan = matchUrl(url, setting["websiteExcludeList"]);
   var isWhiteListBan = setting["websiteWhiteList"]?.length != 0 && !matchUrl(url, setting["websiteWhiteList"]);
   if (isExcludeBan || isWhiteListBan) {
-    throw new util.TooltipUrlExcludeError();
+    return true;
   }
 }
 

src/util/index.js

@@ -618,11 +618,3 @@ export function getAllShadows(el = document.body) {
   const result = Array.from(childShadows);
   return result.concat(childResults).flat();
 }
-
-export class TooltipUrlExcludeError extends Error {
-  constructor(name = "TooltipUrlExcludeError", message = "URL is excluded or not in the whitelist.", details = {}) {
-    super(message);
-    this.name = name;
-    this.details = details;
-  }
-}