Add enable() and disable() function to ruleset objects.

katmagic · katmagic · commit 3fcda8ce9b54 · 2011-05-04T13:43:31.000-04:00
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -36,15 +36,15 @@ function RuleSet(name, match_rule, default_off) {
   this.rules = [];
   this.exclusions = [];
   this.cookierules = [];
-  var prefs = HTTPSEverywhere.instance.get_prefs();
+  this.prefs = HTTPSEverywhere.instance.get_prefs();
   try {
     // if this pref exists, use it
-    this.active = prefs.getBoolPref(name);
+    this.active = this.prefs.getBoolPref(name);
   } catch (e) {
     // if not, create it
     this.log(DBUG, "Creating new pref " + name);
     this.active = true;
-    prefs.setBoolPref(name, this.on_by_default);
+    this.prefs.setBoolPref(name, this.on_by_default);
   }
 }
 
@@ -100,6 +100,18 @@ RuleSet.prototype = {
     newuri = newuri.QueryInterface(CI.nsIURI);
     return newuri;
   },
+
+  enable: function() {
+    // Enable us.
+    this.prefs.setBoolPref(this.name, true);
+    this.active = true;
+  },
+
+  disable: function() {
+    // Disable us.
+    this.prefs.setBoolPref(this.name, false);
+    this.active = false;
+  }
 };
 
 const RuleWriter = {
diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
@@ -39,10 +39,12 @@ function https_prefs_init(doc) {
     },
     setCellValue: function(row, col, val) { // toggle a rule's activation
       var rule = this.rules[row];
-      var active = (val == "true");
 
-      o_httpsprefs.setBoolPref(rule.name, active);
-      rule.active = active;
+      if (val == "true") {
+        rule.enable();
+      } else {
+        rule.disable();
+      }
 
       this.treebox.invalidateRow(row);
     },
