Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code review

This commit is contained in:
gorhill 2016-01-29 11:43:12 -05:00
parent a89d3ebe18
commit f81b07fb4d
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/checksums.txt
View File

@ -5,7 +5,7 @@ f914118b301509f92d16ab099d4287ee assets/ublock/filters.txt
146704ad1c0393e342afdb416762c183 assets/ublock/badware.txt 146704ad1c0393e342afdb416762c183 assets/ublock/badware.txt
5baa90e2da7cd6a73edff2010557ee57 assets/ublock/redirect.txt 5baa90e2da7cd6a73edff2010557ee57 assets/ublock/redirect.txt
a2c0edc2da6a2ba591d83f9a105a8401 assets/ublock/experimental.txt a2c0edc2da6a2ba591d83f9a105a8401 assets/ublock/experimental.txt
e1d448e77cc9dd211396b60de9666a69 assets/ublock/resources.txt 73eb60d28f8a7fe9a39607d3fd07933c assets/ublock/resources.txt
b27de2300e02598f6a6ec4065d1d5a53 assets/ublock/filter-lists.json b27de2300e02598f6a6ec4065d1d5a53 assets/ublock/filter-lists.json
50573388b525ede1a920cd4b4ee7fbf0 assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt 50573388b525ede1a920cd4b4ee7fbf0 assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt
61cc16cf02e034370f0f47bc17c46551 assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt 61cc16cf02e034370f0f47bc17c46551 assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt

3
assets/ublock/resources.txt
View File

@ -539,6 +539,7 @@ openload-defuser.js application/javascript
a(r, o); a(r, o);
}; };
}; };
try {
Object.defineProperty(window, 'webpackJsonpdmp', { Object.defineProperty(window, 'webpackJsonpdmp', {
get: function() { get: function() {
return wjdmp; return wjdmp;
@ -547,6 +548,8 @@ openload-defuser.js application/javascript
wjdmp = makefn(a); wjdmp = makefn(a);
} }
}); });
} catch(ex) {
}
})(); })();

7
platform/firefox/vapi-background.js
View File

@ -2637,11 +2637,12 @@ vAPI.toolbarButton = {
} catch (ex) { } catch (ex) {
} }
} }
if ( CustomizableUI !== null ) { if (
if ( Services.vc.compare(Services.appinfo.platformVersion, '36.0') >= 0 ) { CustomizableUI !== null &&
Services.vc.compare(Services.appinfo.platformVersion, '36.0') >= 0
) {
return; return;
} }
}
tbb.codePath = 'legacy'; tbb.codePath = 'legacy';
tbb.id = 'uBlock0-legacy-button'; // NOTE: must match legacy-toolbar-button.css tbb.id = 'uBlock0-legacy-button'; // NOTE: must match legacy-toolbar-button.css