Added option to disable rulesets applied counter.

nullishzero · nullishzero · commit fcfeda22dd2e · 2013-08-30T16:52:22.000-07:00
diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js
@@ -54,6 +54,11 @@ httpsEverywhere.toolbarButton = {
     // make sure icon is proper color during init
     tb.changeIcon();
 
+    // make sure the checkbox for showing counter is properly set
+    var showCounter = tb.shouldShowCounter();
+    var counterItem = document.getElementById('https-everywhere-counter-item');
+    counterItem.setAttribute('checked', showCounter ? 'true' : 'false');
+
     // show ruleset counter when a tab is changed
     tb.updateRulesetsApplied();
     gBrowser.tabContainer.addEventListener(
@@ -133,7 +138,8 @@ httpsEverywhere.toolbarButton = {
   updateRulesetsApplied: function() {
     var toolbarbutton = document.getElementById('https-everywhere-button');
     var enabled = HTTPSEverywhere.prefs.getBoolPref("globalEnabled");
-    if (!enabled) { 
+    var showCounter = httpsEverywhere.toolbarButton.shouldShowCounter();
+    if (!enabled || !showCounter) { 
       toolbarbutton.setAttribute('rulesetsApplied', 0);
       return;
     }
@@ -171,11 +177,25 @@ httpsEverywhere.toolbarButton = {
     var tb = httpsEverywhere.toolbarButton;
     var sp = Services.prefs;
 
-    var prefExists = !sp.getPrefType(tb.COUNTER_PREF) == PREF_INVALID;
+    var prefExists = sp.getPrefType(tb.COUNTER_PREF);
 
     // the default behavior is to show the rulesets applied counter.
     // if no preference exists (default) or its enabled, show the counter
-    return !prefExists || sp.getBoolPref(counterPref);
+    return !prefExists || sp.getBoolPref(tb.COUNTER_PREF);
+  },
+
+  /**
+   * Toggles the user's preference for displaying the rulesets applied counter
+   * and updates the UI.
+   */
+  toggleShowCounter: function() {
+    var tb = httpsEverywhere.toolbarButton;
+    var sp = Services.prefs;
+
+    var showCounter = tb.shouldShowCounter();
+    sp.setBoolPref(tb.COUNTER_PREF, !showCounter);
+
+    tb.updateRulesetsApplied();
   }
 
 };
diff --git a/src/chrome/content/toolbar_button.xul b/src/chrome/content/toolbar_button.xul
@@ -42,7 +42,8 @@
       <menupopup id="https-everywhere-context" onpopupshowing="show_applicable_list(this)">
         <!-- entries will be written here by ApplicableList.populate_menu() -->
         <menuseparator />
-        <menuitem type="checkbox" checked="true" label="Show Counter" oncommand="" />
+        <menuitem type="checkbox" id="https-everywhere-counter-item" label="Show Counter" 
+          oncommand="httpsEverywhere.toolbarButton.toggleShowCounter()" />
         <menuseparator />
         <menuitem label="&https-everywhere.menu.observatory;" command="https-everywhere-menuitem-observatory" />
         <menuitem label="&https-everywhere.menu.about;" command="https-everywhere-menuitem-about" />
