mirror of
https://github.com/gorhill/uBlock.git
synced 2024-11-24 03:12:46 +01:00
evict possible remnant of resources.txt from cache [Firefox]
This commit is contained in:
parent
6ec3412ba9
commit
6a71fc59a4
@ -975,9 +975,24 @@ var updaterStatus,
|
|||||||
updaterAssetDelayDefault = 120000,
|
updaterAssetDelayDefault = 120000,
|
||||||
updaterAssetDelay = updaterAssetDelayDefault,
|
updaterAssetDelay = updaterAssetDelayDefault,
|
||||||
updaterUpdated = [],
|
updaterUpdated = [],
|
||||||
updaterFetched = new Set();
|
updaterFetched = new Set(),
|
||||||
|
noRemoteResources;
|
||||||
|
|
||||||
var updateFirst = function() {
|
var updateFirst = function() {
|
||||||
|
// Firefox extension reviewers do not want uBO/webext to fetch its own
|
||||||
|
// scriptlets/resources asset from the project's own repo (github.com).
|
||||||
|
// See: https://github.com/gorhill/uBlock/commit/126110c9a0a0630cd556f5cb215422296a961029
|
||||||
|
if ( noRemoteResources === undefined ) {
|
||||||
|
noRemoteResources =
|
||||||
|
typeof vAPI.webextFlavor === 'string' &&
|
||||||
|
vAPI.webextFlavor.startsWith('Mozilla-Firefox-');
|
||||||
|
}
|
||||||
|
// This is to ensure the packaged version will always be used (in case
|
||||||
|
// there is a cache remnant from a pre-stable webext era).
|
||||||
|
// See https://github.com/uBlockOrigin/uAssets/commit/a6c77af4afb45800d4fd7c268a2a5eab5a64daf3#commitcomment-24642912
|
||||||
|
if ( noRemoteResources ) {
|
||||||
|
api.remove('ublock-resources');
|
||||||
|
}
|
||||||
updaterStatus = 'updating';
|
updaterStatus = 'updating';
|
||||||
updaterFetched.clear();
|
updaterFetched.clear();
|
||||||
updaterUpdated = [];
|
updaterUpdated = [];
|
||||||
@ -985,22 +1000,6 @@ var updateFirst = function() {
|
|||||||
updateNext();
|
updateNext();
|
||||||
};
|
};
|
||||||
|
|
||||||
// Firefox extension reviewers do not want uBO/webext to fetch its *own*
|
|
||||||
// scriptlets/resources asset from the project's *own* repo (github.com).
|
|
||||||
var noRemoteResources = false;
|
|
||||||
(function() {
|
|
||||||
if (
|
|
||||||
typeof browser === 'object' &&
|
|
||||||
browser !== null &&
|
|
||||||
browser.runtime instanceof Object &&
|
|
||||||
typeof browser.runtime.getBrowserInfo === 'function'
|
|
||||||
) {
|
|
||||||
browser.runtime.getBrowserInfo().then(function(info) {
|
|
||||||
noRemoteResources = info.vendor === 'Mozilla';
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
|
|
||||||
var updateNext = function() {
|
var updateNext = function() {
|
||||||
var assetDict, cacheDict;
|
var assetDict, cacheDict;
|
||||||
|
|
||||||
@ -1024,7 +1023,7 @@ var updateNext = function() {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// Update of user scripts/resources forbidden?
|
// Update of user scripts/resources forbidden?
|
||||||
if ( assetKey === 'ublock-resources' && noRemoteResources === true ) {
|
if ( assetKey === 'ublock-resources' && noRemoteResources ) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
|
Loading…
Reference in New Issue
Block a user