this addresses #1240 + minor code review

This commit is contained in:
gorhill 2016-03-07 10:17:31 -05:00
parent e5c2eff2d0
commit 2c2dbfeb5e
2 changed files with 14 additions and 4 deletions

View File

@ -5,7 +5,7 @@
98088252cedafb8571cf61b91bea219e assets/ublock/badware.txt
5baa90e2da7cd6a73edff2010557ee57 assets/ublock/redirect.txt
b65ec581214a0d24dad6522a60f827ab assets/ublock/experimental.txt
e10a9861e33cf8174611372d4eda38e3 assets/ublock/resources.txt
b49ff635595425bdb99e53bdf7222cd7 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

View File

@ -409,7 +409,7 @@ yavli-defuser.js application/javascript
Object.defineProperty(window, '__lturl', nourl);
} catch (ex) {
}
var aa = ['_x','_y','_z','pz','xz','yy','yz','zp','zx','zy','gj','fj'];
var aa = ['_x','_y','_z','pz','xz','yy','yz','zp','zx','zy','gj','fj','jf'];
var no = {
set: noopfn,
get: function() {
@ -575,7 +575,7 @@ bab-defuser.js application/javascript
re = /\.bab_elementid.$/;
window.setTimeout = function(a, b) {
if ( typeof a !== 'string' || !re.test(a) ) {
sto(a, b);
return sto(a, b);
}
};
})();
@ -702,7 +702,7 @@ wired-defuser.js application/javascript
re = /^function n\(\)/;
window.setTimeout = function(a, b) {
if ( b !== 50 || !re.test(a.toString()) ) {
sto(a, b);
return sto(a, b);
}
};
})();
@ -735,3 +735,13 @@ opensubtitles.org application/javascript
set: function(a) {}
});
})();
# Might be useful on some sites to be able to foil all calls to `setTimeout`.
# Example of a filter: `example.com##script:inject(setTimeout-defuser)`
setTimeout-defuser application/javascript
(function() {
window.setTimeout = function() {
return 1;
};
})();