From 09316bbffca3f8680ecec7fe8b6e964e4f6a2cf4 Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 14 Mar 2016 11:29:26 -0400 Subject: [PATCH] re. #1461: fiddling --- assets/checksums.txt | 2 +- assets/ublock/resources.txt | 57 ++++++------------------------------- 2 files changed, 9 insertions(+), 50 deletions(-) diff --git a/assets/checksums.txt b/assets/checksums.txt index 3c9744610..ccf0d2898 100644 --- a/assets/checksums.txt +++ b/assets/checksums.txt @@ -5,7 +5,7 @@ dcc881135f01d1e264c2be59a8aaa1e0 assets/ublock/filters.txt 98088252cedafb8571cf61b91bea219e assets/ublock/badware.txt 5baa90e2da7cd6a73edff2010557ee57 assets/ublock/redirect.txt d81312866b351765bb63082274d90293 assets/ublock/experimental.txt -b237e72eceeaf94ea94736d9c506e4b8 assets/ublock/resources.txt +cc7dcacff92175c510ac463f9db8f952 assets/ublock/resources.txt 059e0bfbf22bd242dda7b07389fe09a2 assets/ublock/filter-lists.json 3605c73f21abca428c7eb69a8bc32dfe assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt a91af77c47c302c0741c7445b0fada1a assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt diff --git a/assets/ublock/resources.txt b/assets/ublock/resources.txt index 17279e15a..464ec0c64 100644 --- a/assets/ublock/resources.txt +++ b/assets/ublock/resources.txt @@ -838,53 +838,12 @@ disqus.com/embed.js application/javascript # https://github.com/gorhill/uBlock/issues/1461 ytad-defuser.js application/javascript (function() { - var ytp, ytpc; - var trapytpca = function() { - if ( ytpc && ytpc.args && typeof ytpc.args.ad_slots === 'string' ) { - ytpc.args.ad_slots = '-1'; - ytpc.args.afv_instream_max = '500'; - delete ytpc.args.vmap; - } - }; - var trapytpc = function() { - ytpc = ytp.config; - if ( ytpc ) { - trapytpca(); - return; - } - try { - Object.defineProperty(ytp, 'config', { - get: function() { - return ytpc; - }, - set: function(a) { - ytpc = a; - trapytpca(); - } - }); - } catch (ex) { - } - }; - var trapytp = function() { - ytp = window.ytplayer; - if ( ytp ) { - trapytpc(); - return; - } - try { - Object.defineProperty(window, 'ytplayer', { - get: function() { - return ytp; - }, - set: function(a) { - ytp = a; - if ( !a.config ) { - trapytpc(); - } - } - }); - } catch (ex) { - } - }; - trapytp(); + var sto = window.setTimeout; + window.setTimeout = function(a, b) { + if ( b === 15000 ) { + a(); + return; + } + return sto(a, b); + }; })();