Unneded log removal, "Start with ..." fixed, some makeup

rburke · Oct 8, 2010 · 2c4cfde · 2c4cfde
1 parent fe269d7
commit 2c4cfde
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/firefox/content/options.xul b/firefox/content/options.xul
@@ -100,7 +100,6 @@
         <checkbox 
           id="keysharky-toggleServerStartup" 
           command="keysharky_cmd_toggleServerStartup" 
-          label="Start with Firefox" 
           checked="false"/>
       </hbox>
 

diff --git a/firefox/content/overlay.js b/firefox/content/overlay.js
@@ -316,7 +316,7 @@ var keysharky = {
 
         return true;
       }catch(e){
-        this.log(e);
+
         this.findGrooveshark();
 
         try{
@@ -325,7 +325,6 @@ var keysharky = {
 
           return true;
         }catch(e){
-          this.log(e);
           this.log("couldn't toggle '" + s + "'");
           return false;
         }
@@ -416,8 +415,10 @@ var keysharky = {
     }
 
     this.optionsDoc.getElementById("keysharky-toggleServer").setAttribute("label", (this.gsAPI == undefined ? "Start" : "Stop"));
+    this.optionsDoc.getElementById("keysharky-toggleServerStartup").setAttribute("label", "Start with " + (this.environment == "prism" ? "Prism" : "Firefox"))
     this.optionsDoc.getElementById("keysharky-toggleServerStartup").setAttribute("checked", this.get_server_autostart());
-
+
+
     var toggleServerPort = this.optionsDoc.getElementById("keysharky-toggleServerPort");
     toggleServerPort.value = this.get_server_port();
 
@@ -487,6 +488,7 @@ var keysharky = {
     }
   },
 
+  // Checkbox toogling action
   toggleCombo: function(id){
     if (this.allToggles[id] != undefined){
       var checkbox = keysharky.optionsDoc.getElementById("keysharky-enabler-" + id);
@@ -540,9 +542,6 @@ var keysharky = {
         if (!this.allToggles[id_arr[i]])
           continue;
 
-
-        this.log(i + " key is " + json_arr[i]["enabled"]);
-
         if (json_arr[i]["enabled"]){
           // Create new key element
           var newKey = win.document.createElement("key");
@@ -559,16 +558,14 @@ var keysharky = {
         for(var x=0; x<keySet.childNodes.length; x++){
           if (keySet.childNodes[x].getAttribute("id") == "keysharky_key_" + id_arr[i]){
             try{
-              this.log(i + " removal!");
               keySet.removeChild(keySet.childNodes[x]);
             }catch(e){}
             break;
           }
         }
 
-
-        // And at last append it to cloned object
         if (json_arr[i]["enabled"]){
+          // And at last append it to cloned object
           keySet.appendChild(newKey);
         }
       }

diff --git a/firefox/skin/options.css b/firefox/skin/options.css
@@ -1,5 +1,6 @@
 #keysharky_readme {
-  background-color: #AE0000; 
+  background: #AE0000; 
+  background: -moz-linear-gradient(top, #a90329 0%, #8f0222 44%, #6d0019 100%);
   color: #fff; 
   cursor: pointer; 
   font-size: 10px;