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

code review related to #405

This commit is contained in:
gorhill 2014-12-15 14:37:09 -05:00
parent 371cf464c0
commit a1172b1efe
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/js/storage.js
View File

@ -651,6 +651,7 @@
// https://github.com/gorhill/uBlock/issues/226
// Whitelist in memory.
// Whitelist parser needs PSL to be ready.
// gorhill 2014-12-15: not anymore
var onWhitelistReady = function() {
whitelistReady = true;
if ( filtersReady ) {
@ -659,9 +660,8 @@
};
// Load order because dependencies:
// User settings -> PSL -> [filter lists, user whitelist]
// User settings -> PSL -> [filter lists]
var onPSLReady = function() {
µb.loadWhitelist(onWhitelistReady);
µb.loadFilterLists(onFiltersReady);
};
@ -670,7 +670,7 @@
var onSelfieReady = function(success) {
if ( success === true ) {
fromSelfie = true;
µb.loadWhitelist(onWhitelistReady);
onFiltersReady();
return;
}
µb.loadPublicSuffixList(onPSLReady);
@ -686,6 +686,7 @@
};
this.loadUserSettings(onUserSettingsReady);
this.loadWhitelist(onWhitelistReady);
this.loadLocalSettings();
this.getBytesInUse();
};