From 6e6b61ae91d79e7f435320578cf61756c049350e Mon Sep 17 00:00:00 2001 From: uBlock <35694050+uBlockAdmin@users.noreply.github.com> Date: Tue, 12 Feb 2019 13:26:32 +0530 Subject: [PATCH 1/2] Turn off AA by default --- assets/ublock/filter-lists.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/ublock/filter-lists.json b/assets/ublock/filter-lists.json index 496f5958a..4bd65e313 100644 --- 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" From cf5241afcce3d95009815149084e42611c1e9af7 Mon Sep 17 00:00:00 2001 From: uBlock <35694050+uBlockAdmin@users.noreply.github.com> Date: Tue, 12 Feb 2019 13:42:28 +0530 Subject: [PATCH 2/2] AA related changes --- src/js/background.js | 2 +- src/js/start.js | 5 +++-- src/js/storage.js | 8 +++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/js/background.js b/src/js/background.js index 176d5582b..09ee30b46 100644 --- 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 index 0f065d6e0..3cd4a0852 100644 --- 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 index 13c334b20..88c881edf 100644 --- 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(