this fixes #389

gorhill · Jul 27, 2014 · ac140f7 · ac140f7
1 parent d60be20
commit ac140f7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/assets/httpsb/ubiquitous-block-lists.json b/assets/httpsb/ubiquitous-block-lists.json
@@ -21,6 +21,7 @@
         "title": "MVPS HOSTS"
         },
     "spam404bl.com/spam404scamlist.txt": {
+        "off": true,
         "title": "Spam404"
         },
     "easylist-downloads.adblockplus.org/easylist.txt": {

diff --git a/js/background.js b/js/background.js
@@ -29,7 +29,6 @@ var HTTPSB = (function() {
 
 var defaultUserAgentStrings = [
     '# http://www.useragentstring.com/pages/Chrome/',
-    'Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2049.0 Safari/537.36',
     'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.67 Safari/537.36',
     'Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.67 Safari/537.36',
     'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1944.0 Safari/537.36',

diff --git a/js/install.js b/js/install.js
@@ -31,7 +31,7 @@ var onInstalledHandler = function(details) {
     if ( details.reason !== 'install' ) {
         return;
     }
-    HTTPSB.utils.gotoExtensionURL('setup.html');
+    // HTTPSB.utils.gotoExtensionURL('setup.html');
 };
 
 chrome.runtime.onInstalled.addListener(onInstalledHandler);

diff --git a/js/storage.js b/js/storage.js
@@ -103,9 +103,7 @@ HTTPSB.loadScopedRules = function() {
             }
         } else {
             // Sensible defaults
-            httpsb.whitelistTemporarily('*', 'stylesheet', '*');
-            httpsb.whitelistTemporarily('*', 'image', '*');
-            httpsb.blacklistTemporarily('*', 'sub_frame', '*');
+            httpsb.whitelistTemporarily('*', '*', '*');
             httpsb.createTemporaryScopeFromScopeKey(httpsb.behindTheSceneScopeKey);
             httpsb.whitelistTemporarily(httpsb.behindTheSceneScopeKey, '*', '*');
             httpsb.toggleTemporaryMtxFiltering(httpsb.behindTheSceneScopeKey, false);