Merge branch 'develop' into feature/update-linter

app/content-scripts/click_to_play.js

@@ -173,19 +173,6 @@ const Click2PlayContentScript = (function(win, doc) {
 			sendResponse();
 			return false;
 		});
-
-		window.addEventListener('load', () => {
-			const app_ids = Object.keys(C2P_DATA);
-			for (let i = 0; i < app_ids.length; i++) {
-				const app_id = app_ids[i];
-				if (Object.prototype.hasOwnProperty.call(C2P_DATA, app_id)) {
-					if (C2P_DATA[app_id].length >= 3) {
-						applyC2P(C2P_DATA[app_id][0], C2P_DATA[app_id][1], C2P_DATA[app_id][2]);
-					}
-				}
-			}
-			// TODO clear C2P_DATA to free memory
-		}, { capture: false, passive: true });
 	};
 
 	// Public API

src/classes/EventHandlers.js

@@ -880,7 +880,7 @@ class EventHandlers {
 	 *
 	 */
 	static _resetNotifications() {
-		globals.C2P_LOADED = globals.NOTIFICATIONS_LOADED = false; // eslint-disable-line no-multi-assign
+		globals.NOTIFICATIONS_LOADED = false;
 	}
 }
 

src/utils/click2play.js

@@ -60,8 +60,7 @@ export function buildC2P(details, app_id) {
 	}
 	const app_name = bugDb.db.apps[app_id].name;
 	const c2pHtml = [];
-	const tab_host = tabInfo.getTabInfo(tab_id, 'host');
-	const blacklisted = !!Policy.blacklisted(tab_host);
+	const blacklisted = !!Policy.blacklisted(tab.host);
 
 	// Generate the templates for each c2p definition (could be multiple for an app ID)
 	c2pApp.forEach((c2pAppDef) => {