prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #2585

Browse source
This commit is contained in:
gorhill 2017-05-06 13:19:05 -04:00
parent 73def7eab3
commit fe61cdddee
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/js/storage.js
View file

@ -415,7 +415,7 @@
µb.staticNetFilteringEngine.freeze(); µb.staticNetFilteringEngine.freeze();
µb.redirectEngine.freeze(); µb.redirectEngine.freeze();
µb.cosmeticFilteringEngine.freeze(); µb.cosmeticFilteringEngine.freeze();
µb.selfieManager.create(); µb.selfieManager.destroy();
}; };
var onLoaded = function(details) { var onLoaded = function(details) {
@ -597,7 +597,7 @@
callback(); callback();
µb.selfieManager.create(); µb.selfieManager.destroy();
µb.loadingFilterLists = false; µb.loadingFilterLists = false;
}; };
@ -895,47 +895,31 @@
// some set time. // some set time.
µBlock.selfieManager = (function() { µBlock.selfieManager = (function() {
var µb = µBlock;
var timer = null; var timer = null;
var create = function() { var create = function() {
timer = null; timer = null;
var selfie = { var selfie = {
magic: µb.systemSettings.selfieMagic, magic: this.systemSettings.selfieMagic,
publicSuffixList: publicSuffixList.toSelfie(), publicSuffixList: publicSuffixList.toSelfie(),
availableFilterLists: µb.availableFilterLists, availableFilterLists: this.availableFilterLists,
staticNetFilteringEngine: µb.staticNetFilteringEngine.toSelfie(), staticNetFilteringEngine: this.staticNetFilteringEngine.toSelfie(),
redirectEngine: µb.redirectEngine.toSelfie(), redirectEngine: this.redirectEngine.toSelfie(),
cosmeticFilteringEngine: µb.cosmeticFilteringEngine.toSelfie() cosmeticFilteringEngine: this.cosmeticFilteringEngine.toSelfie()
}; };
vAPI.cacheStorage.set({ selfie: selfie }); vAPI.cacheStorage.set({ selfie: selfie });
}; }.bind(µBlock);
var createAsync = function(after) {
if ( typeof after !== 'number' ) {
after = µb.selfieAfter;
}
if ( timer !== null ) {
clearTimeout(timer);
}
timer = vAPI.setTimeout(create, after);
};
var destroy = function() { var destroy = function() {
if ( timer !== null ) { if ( timer !== null ) {
clearTimeout(timer); clearTimeout(timer);
timer = null; timer = null;
} }
vAPI.cacheStorage.remove('selfie'); vAPI.cacheStorage.remove('selfie');
}; timer = vAPI.setTimeout(create, this.selfieAfter);
}.bind(µBlock);
return { return {
create: createAsync,
destroy: destroy destroy: destroy
}; };
})(); })();
@ -1117,6 +1101,10 @@
cached: cached cached: cached
}); });
// https://github.com/gorhill/uBlock/issues/2585
// Whenever an asset is overwritten, the current selfie is quite
// likely no longer valid.
this.selfieManager.destroy();
return; return;
} }