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

preparing for 1st release candidate

This commit is contained in:
gorhill 2015-02-15 07:16:31 -05:00
parent a9acf9de26
commit 388ac77166
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/js/assets.js
View File

@ -265,11 +265,21 @@ var cachedAssetsManager = (function() {
var getTextFileFromURL = function(url, onLoad, onError) {
// https://github.com/gorhill/uMatrix/issues/15
var onResponseReceived = function() {
// xhr for local files gives status 0, but actually succeeds
if ( (this.status >= 200 && this.status < 300) || (this.status === 0 && this.responseText) ) {
return onLoad.call(this);
if ( this.status < 200 || this.status >= 300 ) {
return onError.call(this);
}
return onError.call(this);
// xhr for local files gives status 0, but actually succeeds
if ( this.status === 0 && stringIsNotEmpty(this.responseText) === false ) {
return onError.call(this);
}
// we never download anything else than plain text: discard if response
// appears to be a HTML document: could happen when server returns
// some kind of error page I suppose
var text = this.responseText.trim();
if ( text.charAt(0) === '<' && text.slice(-1) === '>' ) {
return onError.call(this);
}
return onLoad.call(this);
};
// console.log('µBlock> getTextFileFromURL("%s"):', url);
var xhr = new XMLHttpRequest();
@ -1078,10 +1088,10 @@ var exports = {};
var onAssetUpdated = function(details) {
var path = details.path;
if ( details.error ) {
console.debug('assets.js > µBlock.assetUpdater/onAssetUpdated: "%s" failed', path);
//console.debug('assets.js > µBlock.assetUpdater/onAssetUpdated: "%s" failed', path);
return;
}
console.debug('assets.js > µBlock.assetUpdater/onAssetUpdated: "%s"', path);
//console.debug('assets.js > µBlock.assetUpdater/onAssetUpdated: "%s"', path);
updated[path] = true;
updatedCount += 1;
@ -1109,7 +1119,7 @@ var updateOne = function() {
if ( !metaEntry.cacheObsolete && !metaEntry.repoObsolete ) {
continue;
}
console.debug('assets.js > µBlock.assetUpdater/updateOne: assets.get("%s")', path);
//console.debug('assets.js > µBlock.assetUpdater/updateOne: assets.get("%s")', path);
µb.assets.get(path, onAssetUpdated);
break;
}
@ -1136,7 +1146,7 @@ var updateDaemon = function() {
// Start an update cycle?
if ( updateCycleTime !== 0 ) {
if ( Date.now() >= updateCycleTime ) {
console.debug('assets.js > µBlock.assetUpdater/updateDaemon: update cycle started');
//console.debug('assets.js > µBlock.assetUpdater/updateDaemon: update cycle started');
reset();
if ( onStart !== null ) {
onStart();
@ -1159,7 +1169,7 @@ var updateDaemon = function() {
// If anything was updated, notify listener
if ( updatedCount !== 0 ) {
if ( onCompleted !== null ) {
console.debug('assets.js > µBlock.assetUpdater/updateDaemon: update cycle completed');
//console.debug('assets.js > µBlock.assetUpdater/updateDaemon: update cycle completed');
onCompleted({
updated: JSON.parse(JSON.stringify(updated)), // give callee its own safe copy
updatedCount: updatedCount
@ -1170,7 +1180,7 @@ var updateDaemon = function() {
// Schedule next update cycle
if ( updateCycleTime === 0 ) {
reset();
console.debug('assets.js > µBlock.assetUpdater/updateDaemon: update cycle re-scheduled');
//console.debug('assets.js > µBlock.assetUpdater/updateDaemon: update cycle re-scheduled');
updateCycleTime = Date.now() + updateCycleNextPeriod;
}
};
@ -1214,7 +1224,7 @@ exports.add = function(path) {
return;
}
console.debug('assets.js > µBlock.assetUpdater.add("%s")', path);
//console.debug('assets.js > µBlock.assetUpdater.add("%s")', path);
toUpdate[path] = true;
toUpdateCount += 1;

8
src/js/storage.js
View File

@ -547,7 +547,7 @@
cosmeticFilteringEngine: this.cosmeticFilteringEngine.toSelfie()
};
vAPI.storage.set({ selfie: selfie });
console.log('storage.js > µBlock.toSelfie()');
//console.debug('storage.js > µBlock.toSelfie()');
};
// This is to be sure the selfie is generated in a sane manner: the selfie will
@ -601,7 +601,7 @@
µBlock.destroySelfie = function() {
vAPI.storage.remove('selfie');
this.asyncJobs.remove('toSelfie');
console.log('storage.js > µBlock.destroySelfie()');
//console.debug('storage.js > µBlock.destroySelfie()');
};
/******************************************************************************/
@ -640,7 +640,7 @@
var onPSLReady = function() {
if ( updatedCount !== 0 ) {
console.debug('storage.js > µBlock.updateCompleteHandler: reloading filter lists');
//console.debug('storage.js > µBlock.updateCompleteHandler: reloading filter lists');
µb.loadFilterLists(onFiltersReady);
} else {
onFiltersReady();
@ -652,7 +652,7 @@
}
if ( details.hasOwnProperty(this.pslPath) ) {
console.debug('storage.js > µBlock.updateCompleteHandler: reloading PSL');
//console.debug('storage.js > µBlock.updateCompleteHandler: reloading PSL');
this.loadPublicSuffixList(onPSLReady);
updatedCount -= 1;
} else {