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

changed my mind

This commit is contained in:
gorhill 2014-09-03 20:55:16 -04:00
parent 8dc85407e6
commit e8eb452f73
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/assets.js
View File

@ -382,17 +382,26 @@ var readLocalFile = function(path, callback) {
reportBack('', 'Error');
};
var onCachedContentReady = function(details) {
//console.log('µBlock> readLocalFile("%s") / onCachedContentReady()', path);
// It's ok for user data to be empty
if ( !details.error && (details.content !== '' || reIsUserPath.test(path)) ) {
var onCachedContentLoaded = function(details) {
//console.log('µBlock> readLocalFile("%s") / onCachedContentLoaded()', path);
reportBack(details.content);
};
var onCachedContentError = function(details) {
//console.error('µBlock> readLocalFile("%s") / onCachedContentError()', path);
if ( reIsExternalPath.test(path) ) {
reportBack('', 'Error: asset not found');
return;
}
// It's ok for user data to be empty
if ( reIsUserPath.test(path) ) {
reportBack('');
return;
}
getTextFileFromURL(chrome.runtime.getURL(details.path), onInstallFileLoaded, onInstallFileError);
};
cachedAssetsManager.load(path, onCachedContentReady);
cachedAssetsManager.load(path, onCachedContentLoaded, onCachedContentError);
};
// https://www.youtube.com/watch?v=r9KVpuFPtHc