fix https://gitlab.com/xuhaiyang1234/NanoAdblockerSecretIssues/issues/15

jspenguin2017 · May 6, 2018 · c0aa895 · c0aa895
1 parent 574907b
commit c0aa895
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/src/background/core.js b/src/background/core.js
@@ -18,12 +18,23 @@ a.init = () => {
                  */
                 case "inject css":
                     if (args[1].tab && args[1].tab.id !== chrome.tabs.TAB_ID_NONE) {
-                        chrome.tabs.insertCSS(args[1].tab.id, {
-                            code: args[0]["data"],
-                            frameId: args[1].frameId || 0,
-                        }, () => {
-                            void chrome.runtime.lastError;
-                        });
+                        // TODO: Clean this up when minimum required version of Chrome is 66 or higher
+                        try {
+                            chrome.tabs.insertCSS(args[1].tab.id, {
+                                code: args[0]["data"],
+                                frameId: args[1].frameId || 0,
+                                cssOrigin: "user",
+                            }, () => {
+                                void chrome.runtime.lastError;
+                            });
+                        } catch (err) {
+                            chrome.tabs.insertCSS(args[1].tab.id, {
+                                code: args[0]["data"],
+                                frameId: args[1].frameId || 0,
+                            }, () => {
+                                void chrome.runtime.lastError;
+                            });
+                        }
                     }
                     break;
 

diff --git a/src/content/rules-specific.js b/src/content/rules-specific.js
@@ -3079,6 +3079,12 @@ if (a.domCmp(["boost.ink"])) {
     });
 }
 
+// Nano Adblocker does not support UserCSS because it breaks DOM Inspector, duct tape it here
+// TODO: Convert to filter (or remove if already in uAssets) when minimum required version of Chrome is 66 or higher
+if (a.domCmp(["hdblog.it", "hdmotori.it"])) {
+    a.css("body { background:none; overflow:auto;}");
+}
+
 // >>>>> >>>>> >>>>> >>>>> >>>>> >>>>>
 //Partially working
 if (a.domCmp(["hulu.com"])) {

diff --git a/src/manifest.json b/src/manifest.json
@@ -56,5 +56,5 @@
     "webRequest",
     "webRequestBlocking"
   ],
-  "version": "14.7"
+  "version": "14.8"
 }