From e8eb452f735c31e598aae96da963290f8343ac39 Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 3 Sep 2014 20:55:16 -0400 Subject: [PATCH] changed my mind --- js/assets.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/js/assets.js b/js/assets.js index bd2f86bec..8e25d2780 100644 --- a/js/assets.js +++ b/js/assets.js @@ -382,17 +382,26 @@ var readLocalFile = function(path, callback) { reportBack('', 'Error'); }; - var onCachedContentReady = function(details) { - //console.log('µBlock> readLocalFile("%s") / onCachedContentReady()', 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 ( !details.error && (details.content !== '' || reIsUserPath.test(path)) ) { - reportBack(details.content); + 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