Tab highlighting tabs cleanup

ithinc · ithinc · commit 2fadb9858150 · 2014-03-12T16:50:39.000+08:00
diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
@@ -606,11 +606,11 @@
             <caption label="&highlight.caption;"/>
             <tabbox>
               <tabs id="highlight" onselect="onHighlightTabSelect();">
-                <tab label="&highlight.tab1.label;" observes="b.highlightCurrent"/>
-                <tab label="&highlight.tab2.label;" observes="b.highlightUnread"/>
-                <tab label="&highlight.tab3.label;" observes="b.highlightRead"/>
-                <tab label="&highlight.tab6.label;" observes="b.highlightUnloaded"/>
-                <tab label="&highlight.tab7.label;" observes="b.highlightSelected"/>
+                <tab label="&highlight.tab1.label;" value="Current" observes="b.highlightCurrent"/>
+                <tab label="&highlight.tab2.label;" value="Unread" observes="b.highlightUnread"/>
+                <tab label="&highlight.tab3.label;" value="Read" observes="b.highlightRead"/>
+                <tab label="&highlight.tab6.label;" value="Unloaded" observes="b.highlightUnloaded"/>
+                <tab label="&highlight.tab7.label;" value="Selected" observes="b.highlightSelected"/>
               </tabs>
               <tabpanels>
                 <tabpanel orient="vertical">
@@ -1195,18 +1195,16 @@
     }
 
     function onHighlightTabSelect() {
-      var target = $("highlight");
-      var tabs = ["Current", "Unread", "Read", "Unloaded", "Selected"];
+      var prefName = $("highlight").selectedItem.value;
 
-      $("c.highlightEnabled").setAttribute("preference", "highlight" + tabs[target.selectedIndex]);
-      $("c.highlightEnabled").checked = $("highlight" + tabs[target.selectedIndex]).value;
+      $("c.highlightEnabled").setAttribute("preference", "highlight" + prefName);
+      $("c.highlightEnabled").checked = $("highlight" + prefName).value;
 
-      onHighlightEnabled(tabs[target.selectedIndex]);
+      onHighlightEnabled(prefName);
     }
 
     function onHighlightEnabled(item) {
-      var tabs = ["Current", "Unread", "Read", "Unloaded", "Selected"];
-      if (item == tabs[$("highlight").selectedIndex]) {
+      if (item == $("highlight").selectedItem.value) {
         setDisabled("b.highlightEnabled", !$("highlight" + item).value);
       }
 
@@ -1233,8 +1231,7 @@
                                     : ""
       );
 
-      var tabs = ["Current", "Unread", "Read", "Unloaded", "Selected"];
-      if (item == tabs[$("highlight").selectedIndex]) {
+      if (item == $("highlight").selectedItem.value) {
         $("c.highlightBold").checked = style.bold;
         $("c.highlightItalic").checked = style.italic;
         $("c.highlightUnderline").checked = style.underline;
@@ -1274,8 +1271,7 @@
         opacityCode: $("c.highlightOpacityCode").value / 100
       };
 
-      var tabs = ["Current", "Unread", "Read", "Unloaded", "Selected"];
-      $("style" + tabs[$("highlight").selectedIndex]).value = JSON.stringify(style);
+      $("style" + $("highlight").selectedItem.value).value = JSON.stringify(style);
     }
 
     function onHighlightColor() {
