all functions working

nsimmonds · Nov 8, 2012 · 23121bb · 23121bb
1 parent b7e19c9
commit 23121bb
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 28 deletions.
diff --git a/mailscripts.js b/mailscripts.js
@@ -13,39 +13,42 @@ var def;
 var mailUrl;
 var port = chrome.extension.connect({name: "localStorage"})
 
+function changeDefaults(string){
+    switch (string) {
+            case "g":
+                    mailUrl = gMailUrl;
+                    // Gmail uses a different subject identifier
+                    subject = gMailSub;
+                    break;
+
+            case "y":
+                    mailUrl = yMailUrl;
+                    break;
+
+            case "l":
+                    mailUrl = lMailUrl;
+                    break;
+
+            case "o":
+                    mailUrl = owaUrl;
+                    break;
+
+            // use Gmail as the default option, just in case.	
+            default:
+                    mailUrl = gMailUrl;
+                    subject = gMailSub;
+    }
+}
+
 port.onMessage.addListener(function(storage){
     if (storage.toggle == "on")
         tog = true
     else
         tog = false
     def = storage["default"]
+    changeDefaults(def)
 })
 
-switch (def) {
-        case "g":
-                mailUrl = gMailUrl;
-                // Gmail uses a different subject identifier
-                subject = gMailSub;
-                break;
-
-        case "y":
-                mailUrl = yMailUrl;
-                break;
-
-        case "l":
-                mailUrl = lMailUrl;
-                break;
-
-        case "o":
-                mailUrl = owaUrl;
-                break;
-
-        // use Gmail as the default option, just in case.	
-        default:
-                mailUrl = gMailUrl;
-                subject = gMailSub;
-}
-
 port.postMessage({sendMe: "localStorage"})
 
 // note (for debugging/learning purposes) that the function above doesn't fire until

diff --git a/manifest.json b/manifest.json
@@ -25,7 +25,8 @@
 	},
 
 	"permissions": [
-		"*://*/*"
+		"*://*/*",
+                "contextMenus"
 	],
 
 	"icons": {

diff --git a/preferences.html b/preferences.html
@@ -11,10 +11,9 @@
         }
     </style>
 </head>
+<body>
 <script src="options.js">
 </script>
-<script src="toggle.js"></script>
-<body>
 <img src="bigicon.png" />
 <p>Select the webmail providers you use:</p>
 <input type="checkbox" id="gmail"/> Gmail<br />

diff --git a/toggle.js b/toggle.js
@@ -45,6 +45,7 @@ chrome.browserAction.onClicked.addListener(function (tab) {
 	}
         chrome.extension.getBackgroundPage().window.location.reload();
         for (tab in chrome.tabs){
+            console.log(tab.id)
             chrome.tabs.reload(tab.id)
         }
 })