Issue EFForg#4060:

kevinjacobs · kevinjacobs · commit b0bc2a4b5c27 · 2011-10-31T00:31:56.000-07:00
Added toolbar button for global enable/disable of the addon. It works by simply removing and re-adding the listeners for now. No graphical feedback as to what the status is.

TO DO:  1) Graphic feedback showing addon status {enabled, disabled} 2) Verify there are no left-over policy bits anywhere that need to be removed.
diff --git a/src/chrome/content/code/ApplicableList.js b/src/chrome/content/code/ApplicableList.js
@@ -80,7 +80,12 @@ ApplicableList.prototype = {
     while(this.menupopup.firstChild.tagName != "menuseparator") {
       this.menupopup.removeChild(this.menupopup.firstChild);
     }
-
+	
+	// add global enable/disable toggle button	
+	var enableLabel = document.createElement('menuitem');
+	enableLabel.setAttribute('label', 'Enable / Disable HTTPS Everywhere');
+    enableLabel.setAttribute('command', 'https-everywhere-menuitem-globalEnableToggle');
+		
     // add the label at the top
     var any_rules = false
     for (var x in this.all) {
@@ -92,7 +97,7 @@ ApplicableList.prototype = {
         label.setAttribute('label', 'Enable / Disable Rules');
     } else {
       if (!weird) label.setAttribute('label', '(No Rules for This Page)');
-      else        label.setAttribute('label', '(Rules for This Page Uknown)');
+      else        label.setAttribute('label', '(Rules for This Page Unknown)');
     }
     label.setAttribute('command', 'https-everywhere-menuitem-preferences');
 
@@ -166,8 +171,9 @@ ApplicableList.prototype = {
         this.add_menuitem(this.active[x], 'active');
     for (var x in this.breaking)
       this.add_menuitem(this.breaking[x], 'breaking');
-    
+	  
     this.prepend_child(label);
+    this.prepend_child(enableLabel);
   },
 
   prepend_child: function(node) {
diff --git a/src/chrome/content/toolbar_button.xul b/src/chrome/content/toolbar_button.xul
@@ -42,6 +42,8 @@
     </toolbarbutton>
   </toolbarpalette>
   <commandset>
+    <command id="https-everywhere-menuitem-globalEnableToggle"
+      oncommand="HTTPSEverywhere.toggleEnabledState();" />
     <command id="https-everywhere-menuitem-preferences"
       oncommand="HTTPSEverywhere.chrome_opener('chrome://https-everywhere/content/preferences.xul');" />
     <command id="https-everywhere-menuitem-about"
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -158,6 +158,7 @@ function HTTPSEverywhere() {
   this.https_rules = HTTPSRules;
   this.INCLUDE=INCLUDE;
   this.ApplicableList = ApplicableList;
+  this.globalEnable = false;
 
   // We need to use observers instead of categories for FF3.0 for these:
   // https://developer.mozilla.org/en/Observer_Notifications
@@ -170,6 +171,7 @@ function HTTPSEverywhere() {
   this.obsService.addObserver(this, "profile-before-change", false);
   this.obsService.addObserver(this, "profile-after-change", false);
   this.obsService.addObserver(this, "sessionstore-windows-restored", false);
+  this.globalEnable = true;
   return;
 }
 
@@ -616,8 +618,30 @@ HTTPSEverywhere.prototype = {
       .getService(CI.nsIWindowMediator) 
       .getMostRecentWindow('navigator:browser')
       .open(uri,'', 'chrome,centerscreen' );
-  }
+  },
 
+  toggleEnabledState: function() {
+	if(this.globalEnable){			  
+		this.obsService.removeObserver(this, "profile-before-change", false);
+		this.obsService.removeObserver(this, "profile-after-change", false);
+		this.obsService.removeObserver(this, "sessionstore-windows-restored", false);		
+		OS.removeObserver(this, "cookie-changed", false);
+		OS.removeObserver(this, "http-on-modify-request", false);
+		OS.removeObserver(this, "http-on-examine-merged-response", false);
+		OS.removeObserver(this, "http-on-examine-response", false);  
+		this.globalEnable = false;
+	}
+	else{		  
+		this.obsService.addObserver(this, "profile-before-change", false);
+		this.obsService.addObserver(this, "profile-after-change", false);
+		this.obsService.addObserver(this, "sessionstore-windows-restored", false);		
+		OS.addObserver(this, "cookie-changed", false);
+		OS.addObserver(this, "http-on-modify-request", false);
+		OS.addObserver(this, "http-on-examine-merged-response", false);
+		OS.addObserver(this, "http-on-examine-response", false);  
+		this.globalEnable = true;
+	}
+  }  
 };
 
 var prefs = 0;
