Respecting user choice on Offers plus removing Edge-specific key from manifest plus fixing vertical blank (GH-1244, GH-1199, GH-1236)

app/scss/panel.scss

@@ -23,6 +23,7 @@
 html body {
 	margin: 0px;
 	font-size: 75%;
+	overflow: hidden;
 }
 *:focus {outline: none;}
 
@@ -41,7 +42,6 @@ html body {
 	background-color: white;
 	height: 516px;
 	width: 580px;
-	overflow: hidden;
 	margin: 0px;
 	padding: 0px;
 }

manifest.json

@@ -12,6 +12,7 @@
 	"version_name": "8.2.0",
 	"default_locale": "en",
 	"description": "__MSG_short_description__",
+	"debug": true,
 	"icons": {
 		"16": "app/images/icon16.png",
 		"48": "app/images/icon48.png",
@@ -93,10 +94,5 @@
 	"web_accessible_resources": [
 		"app/images/*",
 		"dist/css/rewards_styles.css"
-	],
-	"browser_specific_settings": {
-		"edge": {
-			"browser_action_next_to_addressbar": true
-		}
-	}
+	]
 }

src/background.js

@@ -1361,6 +1361,11 @@ function initializeVersioning() {
 				conf.enable_smart_block = false;
 			}
 
+			// Are we upgrading from Ghostery 8 prior to 8.2?
+			if ((+prevVersion[0] === 8) && (prevVersion[1] < 2)) {
+				globals.JUST_UPGRADED_FROM_8_1 = true;
+			}
+
 			// Establish version history
 			const { version_history } = conf;
 			version_history.push(globals.EXTENSION_VERSION);
@@ -1429,18 +1434,28 @@ function initializeGhosteryModules() {
 		Promise.all([
 			initialiseWebRequestPipeline(),
 		]).then(() => {
-			// Upgraded users shouldn't get the anti-suite
 			if (globals.JUST_UPGRADED_FROM_7) {
+				// These users had human web already, so we respect their choice
+				conf.enable_human_web = (IS_EDGE || IS_CLIQZ) ? false : !humanweb.isDisabled;
+				// These users did not have adblocking and antitracking.
+				// We introduce these new features initially disabled.
 				conf.enable_ad_block = false;
 				conf.enable_anti_tracking = false;
+				// Offers however will be enabled unconditionally
 				conf.enable_offers = !((IS_EDGE || IS_CLIQZ));
-				conf.enable_human_web = (IS_EDGE || IS_CLIQZ) ? false : conf.enable_human_web;
+			} else if (globals.JUST_UPGRADED_FROM_8_1) {
+				// These users already had human web, adblocker and antitracking, so we respect their choice
+				conf.enable_ad_block = IS_CLIQZ ? false : !adblocker.isDisabled;
+				conf.enable_anti_tracking = IS_CLIQZ ? false : !antitracking.isDisabled;
+				conf.enable_human_web = (IS_EDGE || IS_CLIQZ) ? false : !humanweb.isDisabled;
+				// These users did not have Offers, so we unconditionally enable them on upgrade.
+				conf.enable_offers = !(IS_EDGE || IS_CLIQZ);
 			} else {
+				// Otherwise we respect browser-core default settings
 				conf.enable_ad_block = IS_CLIQZ ? false : !adblocker.isDisabled;
 				conf.enable_anti_tracking = IS_CLIQZ ? false : !antitracking.isDisabled;
 				conf.enable_human_web = (IS_EDGE || IS_CLIQZ) ? false : !humanweb.isDisabled;
-				// This code forces enable_offers to true on upgrade. Remove in the next version of Ghostery!
-				conf.enable_offers = (IS_EDGE || IS_CLIQZ) ? false : globals.JUST_UPGRADED ? true : !offers.isDisabled;
+				conf.enable_offers = (IS_EDGE || IS_CLIQZ) ? false : !offers.isDisabled;
 			}
 		})).catch((e) => {
 		log('cliqzStartup error', e);

src/classes/ConfData.js

@@ -92,10 +92,6 @@ class ConfData {
 				_initProperty('trackers_banner_status', true);
 			}
 
-			// Disregard original offers value, so that default value is assigned.
-			// REMOVE THIS IS THE NEXT VERSION
-			delete data.enable_offers;
-
 			// simple props
 			_initProperty('alert_bubble_pos', 'br');
 			_initProperty('alert_bubble_timeout', 15);

src/classes/Globals.js

@@ -37,6 +37,7 @@ class Globals {
 		this.JUST_INSTALLED = false;
 		this.JUST_UPGRADED = false;
 		this.JUST_UPGRADED_FROM_7 = false;
+		this.JUST_UPGRADED_FROM_8_1 = false;
 		this.HOTFIX = false;
 		this.LET_REDIRECTS_THROUGH = false;
 		this.C2P_LOADED = false;