Working on 3 browsers

4 files changed, 20 insertions, 6 deletions

diff --git a/css/redirector.css b/css/redirector.css
index 7849f71..3eb2d72 100644
--- a/css/redirector.css
+++ b/css/redirector.css
@@ -272,7 +272,7 @@ a.disabled:hover {
 
 .blur {
   -webkit-filter:blur(3px); 
-  -moz-filter:blur(3px); 
+  filter:blur(3px); 
 }
 
 #edit-redirect-form {
@@ -286,6 +286,7 @@ a.disabled:hover {
   margin-left:-250px;
   top:50%;
   margin-top:-258px;
+  font-size:12px;
 }
 
 #edit-redirect-form div{
@@ -312,11 +313,15 @@ a.disabled:hover {
   color:red;
 }
 
-.placeholder {
+.placeholder,  {
   color:#c0c0c0;
   font-size:11px;
 }
 
+::-moz-placeholder {  /* Firefox 19+ */
+   color: #c0c0c0;  
+}
+
 #advanced-toggle {
   padding-top:3px;
   text-align: center;
diff --git a/js/background.js b/js/background.js
index d080504..15bb89b 100644
--- a/js/background.js
+++ b/js/background.js
@@ -49,7 +49,7 @@ function setIcon(image19, image38, tabId) {
 //decide whether or not we want to redirect.
 function checkRedirects(details) {
 
-	log('Checking: ' + 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
@@ -165,10 +165,11 @@ function createPartitionedRedirects(redirects) {
 function setUpRedirectListener() {
 
 	redirectEvent.removeListener(checkRedirects); //Unsubscribe first, in case there are changes...
-	
-	storage.get('redirects', function(obj) {
+
+	storage.get({redirects:null}, function(obj) {
 		if (!obj.redirects) {
 			log('No redirects to set up');
+			//TODO: import old Firefox redirects
 			return;
 		}
 
@@ -193,8 +194,10 @@ function updateIcon() {
 //First time setup
 updateIcon();
 storage.get({disabled:false}, function(obj) {
+	console.log('REDIRECTOR IS HERE');
 	if (!obj.disabled) {
 		setUpRedirectListener();
 	}
 });
+console.log('Redirector starting up...');
        
\ No newline at end of file
diff --git a/js/controllers/importexport.js b/js/controllers/importexport.js
index 191990c..f46e010 100644
--- a/js/controllers/importexport.js
+++ b/js/controllers/importexport.js
@@ -95,7 +95,7 @@ redirectorApp.config([
  		});
  		
  		var exportObj = { 
- 			createdBy : 'Redirector v' + chrome.app.getDetails().version, 
+ 			createdBy : 'Redirector v' + chrome.runtime.getManifest().version, 
  			createdAt : new Date(), 
  			redirects : redirects 
  		};
diff --git a/js/platform.js b/js/platform.js
new file mode 100644
index 0000000..293ad7a
--- /dev/null
+++ b/js/platform.js
@@ -0,0 +1,6 @@
+//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