From ef25f30b308398319978b011db847947ddfd89f0 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Mon, 7 Feb 2022 07:05:44 -0500 Subject: [PATCH] Squashed commit of the following: commit 34a290bdd62013591b17efbd2320698b95925c00 Author: Yuki2718 <58900598+Yuki2718@users.noreply.github.com> Date: Mon Feb 7 19:14:02 2022 +0900 update last commit commit f34ffbcc3d78bc98ee43b015f0ad0dae9d99720e Author: Yuki2718 <58900598+Yuki2718@users.noreply.github.com> Date: Mon Feb 7 19:05:17 2022 +0900 Improve and rename canrunads.js Related issue: - https://github.com/AdguardTeam/Scriptlets/issues/190 Related commit: - https://github.com/gorhill/uBlock/commit/e8bfc9a03106c47d9e4a4670b024ac9a848bc746 --- src/js/redirect-engine.js | 8 ++++---- .../{canrunads.js => prebid-ads.js} | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) rename src/web_accessible_resources/{canrunads.js => prebid-ads.js} (96%) diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js index 0ec5d0d71..e30a802e2 100644 --- a/src/js/redirect-engine.js +++ b/src/js/redirect-engine.js @@ -66,10 +66,7 @@ const redirectableResources = new Map([ } ], [ 'ampproject_v0.js', { alias: 'ampproject.org/v0.js', - } ], - [ 'canrunads.js', { - data: 'text', - } ], + } ], [ 'chartbeat.js', { alias: 'static.chartbeat.com/chartbeat.js', } ], @@ -176,6 +173,9 @@ const redirectableResources = new Map([ [ 'popads-dummy.js', { data: 'text', } ], + [ 'prebid-ads.js', { + data: 'text', + } ], [ 'scorecardresearch_beacon.js', { alias: 'scorecardresearch.com/beacon.js', } ], diff --git a/src/web_accessible_resources/canrunads.js b/src/web_accessible_resources/prebid-ads.js similarity index 96% rename from src/web_accessible_resources/canrunads.js rename to src/web_accessible_resources/prebid-ads.js index 5ced617dd..f3b2dc675 100644 --- a/src/web_accessible_resources/canrunads.js +++ b/src/web_accessible_resources/prebid-ads.js @@ -22,4 +22,5 @@ (function() { 'use strict'; window.canRunAds = true; + window.isAdBlockActive = false; })();