diff options
| author | Einar Egilsson <einar@einaregilsson.com> | 2015-09-14 14:26:18 +0000 |
|---|---|---|
| committer | Einar Egilsson <einar@einaregilsson.com> | 2015-09-14 14:26:18 +0000 |
| commit | e2cc4f87d36006d74cdcef7362dd51728802d4aa (patch) | |
| tree | 3c17595a8ed75797b28c346b7d4bfd15d6e68acd /js/background.js | |
| parent | 4f421c63472ece0bd6d83d4a64db5168f9f6ba58 (diff) | |
Almost ready
Diffstat (limited to 'js/background.js')
| -rw-r--r-- | js/background.js | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/js/background.js b/js/background.js index 15bb89b..f57bbdf 100644 --- a/js/background.js +++ b/js/background.js @@ -21,7 +21,7 @@ var tabIdToIcon = { function log(msg) { if (log.enabled) { - console.log(msg); + console.log('REDIRECTOR: ' + msg); } } log.enabled = true; @@ -49,7 +49,7 @@ function setIcon(image19, image38, tabId) { //decide whether or not we want to redirect. function checkRedirects(details) { - log('Checking: ' details.type + ': ' + details.url); + log('Checking: ' + details.type + ': ' + details.url); //We only allow GET request to be redirected, don't want to accidentally redirect //sensitive POST parameters @@ -166,15 +166,21 @@ function setUpRedirectListener() { redirectEvent.removeListener(checkRedirects); //Unsubscribe first, in case there are changes... - storage.get({redirects:null}, function(obj) { - if (!obj.redirects) { - log('No redirects to set up'); + storage.get({redirects:'firstrun'}, function(obj) { + var redirects = obj.redirects; + + if (redirects === 'firstrun') { + log('No redirects to set up, first run of extension'); //TODO: import old Firefox redirects return; } - partitionedRedirects = createPartitionedRedirects(obj.redirects); - var filter = createFilter(obj.redirects); + if (redirects.length == 0) { + return; + } + + partitionedRedirects = createPartitionedRedirects(redirects); + var filter = createFilter(redirects); log('Setting filter for listener: ' + JSON.stringify(filter)); redirectEvent.addListener(checkRedirects, filter, ["blocking"]); @@ -194,10 +200,11 @@ function updateIcon() { //First time setup updateIcon(); storage.get({disabled:false}, function(obj) { - console.log('REDIRECTOR IS HERE'); if (!obj.disabled) { setUpRedirectListener(); + } else { + log('Redirector is disabled'); } }); -console.log('Redirector starting up...'); +log('Redirector starting up...');
\ No newline at end of file |