code review: no need to reload dynamic filters when reloading filter lists

This commit is contained in:
gorhill 2014-10-06 17:03:23 -04:00
parent ed7cb573a0
commit 0400352b4f
2 changed files with 2 additions and 2 deletions

View File

@ -1272,6 +1272,7 @@ var FilterContainer = function() {
this.buckets = new Array(4); this.buckets = new Array(4);
this.blockedAnyPartyHostnames = new µb.LiquidDict(); this.blockedAnyPartyHostnames = new µb.LiquidDict();
this.blocked3rdPartyHostnames = new µb.LiquidDict(); this.blocked3rdPartyHostnames = new µb.LiquidDict();
this.dynamicFilters = {};
this.filterParser = new FilterParser(); this.filterParser = new FilterParser();
this.reset(); this.reset();
}; };
@ -1292,7 +1293,6 @@ FilterContainer.prototype.reset = function() {
this.duplicates = Object.create(null); this.duplicates = Object.create(null);
this.blockedAnyPartyHostnames.reset(); this.blockedAnyPartyHostnames.reset();
this.blocked3rdPartyHostnames.reset(); this.blocked3rdPartyHostnames.reset();
this.dynamicFilters = {};
this.filterParser.reset(); this.filterParser.reset();
}; };

View File

@ -667,10 +667,10 @@
// User settings are in memory // User settings are in memory
var onUserSettingsReady = function(settings) { var onUserSettingsReady = function(settings) {
µb.assets.autoUpdate = settings.autoUpdate; µb.assets.autoUpdate = settings.autoUpdate;
µb.contextMenu.toggle(settings.contextMenuEnabled);
µb.netFilteringEngine.dynamicFiltersFromSelfie(settings.dynamicFilteringSelfie); µb.netFilteringEngine.dynamicFiltersFromSelfie(settings.dynamicFilteringSelfie);
µb.fromSelfie(onSelfieReady); µb.fromSelfie(onSelfieReady);
µb.mirrors.toggle(settings.experimentalEnabled); µb.mirrors.toggle(settings.experimentalEnabled);
µb.contextMenu.toggle(settings.contextMenuEnabled);
}; };
this.loadUserSettings(onUserSettingsReady); this.loadUserSettings(onUserSettingsReady);