Merge branch 'v0.9.5.3'

* v0.9.5.3: AA related changes Turn off AA by default
uBlock-LLC · Feb 12, 2019 · d16553e · d16553e · jcvr1994 · Feb 12, 2019
2 parents a5ef451 + cf5241a
commit d16553e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/assets/ublock/filter-lists.json b/assets/ublock/filter-lists.json
@@ -45,6 +45,7 @@
         "homeURL": "https://easylist-downloads.adblockplus.org/easylist.txt"
         },
     "easylist-downloads.adblockplus.org/exceptionrules.txt": {
+        "off": true,
         "title": "Acceptable Ads",
         "group": "ads",
         "homeURL": "https://easylist-downloads.adblockplus.org/exceptionrules.txt"

diff --git a/src/js/background.js b/src/js/background.js
@@ -147,7 +147,7 @@ return {
 
     // so that I don't have to care for last comma
     dummy: 0,
-    turnOffAA: false
+    turnOffAA: true
 };
 
 /******************************************************************************/

diff --git a/src/js/start.js b/src/js/start.js
@@ -220,9 +220,10 @@ var onInstalled = function() {
         }
 
         if(!firstInstall) {
-            µb.turnOffAA = true;
             return;    
-        } 
+        } else {
+            µb.turnOffAA = false;
+        }
         vAPI.storage.get('stats',onDataReceived);
     };
     vAPI.storage.get('extensionLastVersion', onVersionRead);

diff --git a/src/js/storage.js b/src/js/storage.js
@@ -273,11 +273,9 @@
             }
             availableLists[location] = entry;
         }
-        if(µb.turnOffAA) {
-            let locationOfAA = 'assets/thirdparties/easylist-downloads.adblockplus.org/exceptionrules.txt';
-            if(availableLists.hasOwnProperty(locationOfAA) !== false) {
-                availableLists[locationOfAA].off = true;
-            }
+        let locationOfAA = 'assets/thirdparties/easylist-downloads.adblockplus.org/exceptionrules.txt';
+        if(availableLists.hasOwnProperty(locationOfAA) !== false) {
+            availableLists[locationOfAA].off = µb.turnOffAA;
         }
         // Now get user's selection of lists
         vAPI.storage.preferences.get(