From 7f4c5045a464a9a1ae7bffd1ce5535ef746b40fc Mon Sep 17 00:00:00 2001 From: gorhill Date: Fri, 1 Jan 2016 13:02:40 -0500 Subject: [PATCH] more work on neutered googletag using forbes.com as test case --- assets/checksums.txt | 2 +- assets/ublock/resources.txt | 32 +++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/assets/checksums.txt b/assets/checksums.txt index 83f1caf52..ac239af9e 100644 --- a/assets/checksums.txt +++ b/assets/checksums.txt @@ -5,7 +5,7 @@ 146704ad1c0393e342afdb416762c183 assets/ublock/badware.txt 5baa90e2da7cd6a73edff2010557ee57 assets/ublock/redirect.txt 890e6b30c6a4cfd2ac5aa1bbe36d30fe assets/ublock/experimental.txt -a5be71a02eb563f562bb33d23be17bac assets/ublock/resources.txt +54957bd768050e1503e016b1ddc0bcca assets/ublock/resources.txt 0a586f61b5bea73447c1bc1d46791c4c assets/ublock/filter-lists.json 50573388b525ede1a920cd4b4ee7fbf0 assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt 61cc16cf02e034370f0f47bc17c46551 assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt diff --git a/assets/ublock/resources.txt b/assets/ublock/resources.txt index 4aba12a66..25f78d0c5 100644 --- a/assets/ublock/resources.txt +++ b/assets/ublock/resources.txt @@ -211,19 +211,23 @@ googletagservices.com/gpt.js application/javascript // var slot = { addService: noopthisfn, + clearTargeting: noopfn, + defineSizeMapping: noopthisfn, setCategoryExclusion: noopfn, setTargeting: noopthisfn }; - var slotfn = function() { - return slot; - }; + var slotfn = function() { return slot; }; // var pas = { addEventListener: noopfn, clear: noopfn, + collapseEmptyDivs: noopfn, definePassback: noopthisfn, + disableInitialLoad: noopfn, display: noopfn, + enableSingleRequest: noopfn, enableSyncRendering: noopfn, + getSlots: function() { return []; }, refresh: noopfn, set: noopfn, setCategoryExclusion: noopfn, @@ -237,17 +241,27 @@ googletagservices.com/gpt.js application/javascript // var gpt = window.googletag || {}; gpt._vars_ = gpt._vars_ || {}; - gpt.cmd = gpt.cmd || []; gpt.display = noopfn; gpt.defineSlot = slotfn; gpt.defineOutOfPageSlot = slotfn; gpt.enableServices = noopfn; gpt.getVersion = gpt.getVersion || noopfn; - gpt.pubads = function() { - return pas; - }; - gpt.sizeMapping = function() { - return smb; + gpt.pubads = function() { return pas; }; + gpt.sizeMapping = function() { return smb; }; + // + if ( Array.isArray(gpt.cmd) ) { + gpt.cmd.forEach(function(a) { + if ( typeof a === 'function' ) { + a(); + } + }); + } + gpt.cmd = { + push: function(a) { + if ( typeof a === 'function' ) { + a(); + } + } }; // window.googletag = gpt;