From e2cc4f87d36006d74cdcef7362dd51728802d4aa Mon Sep 17 00:00:00 2001
From: Einar Egilsson <einar@einaregilsson.com>
Date: Mon, 14 Sep 2015 14:26:18 +0000
Subject: Almost ready

---
 js/background.js                 | 25 ++++++++++++++++---------
 js/controllers/redirectorpage.js |  7 ++-----
 js/platform.js                   |  6 ------
 js/redirect.js                   |  2 +-
 4 files changed, 19 insertions(+), 21 deletions(-)
 delete mode 100644 js/platform.js

(limited to 'js')

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
diff --git a/js/controllers/redirectorpage.js b/js/controllers/redirectorpage.js
index 05fbe9f..9f0fba6 100644
--- a/js/controllers/redirectorpage.js
+++ b/js/controllers/redirectorpage.js
@@ -19,15 +19,12 @@ redirectorApp.controller('RedirectorPageCtrl', ['$scope', '$timeout', function($
 		var arr = $s.redirects.map(normalize);
 
 		storage.set({redirects:arr}, function() {
-			console.log('Saved redirects at ' + new Date());
+			console.log('Saved ' + arr.length + ' redirects at ' + new Date());
 		});
 	}
  
  	$s.redirects = [];
- 	storage.get('redirects', function(results) {
- 		if (!results || !results.redirects) {
- 			return;
- 		}
+ 	storage.get({redirects:[]}, function(results) {
 
  		for (var i=0; i < results.redirects.length; i++) {
 			$s.redirects.push(normalize(results.redirects[i]));
diff --git a/js/platform.js b/js/platform.js
deleted file mode 100644
index 293ad7a..0000000
--- a/js/platform.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//This file contains the stuff that's different between browsers, as much as possible
-
-//Defaults are the Chrome apis, then we override what's necessary...
-var platform = {
-
-};
\ No newline at end of file
diff --git a/js/redirect.js b/js/redirect.js
index 16fa78c..7433027 100644
--- a/js/redirect.js
+++ b/js/redirect.js
@@ -113,7 +113,7 @@ Redirect.prototype = {
 
 
 		if (!this.exampleUrl) {
-			this.error = 'No example URL defined';
+			this.error = 'No example URL defined.';
 			return;
 		}
 
-- 
cgit v1.2.3