Revert "Revert "Disable HTTP Nowhere menu item when HTTPS Everywhere is disabled""

diracdeltas · diracdeltas · commit 5e15c3824b75 · 2014-07-27T23:52:10.000-07:00
This reverts commit 27119a1.
diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js
@@ -73,6 +73,8 @@ httpsEverywhere.toolbarButton = {
     httpNowhereItem.setAttribute('checked', showHttpNowhere ? 'true' : 'false');
     toolbarbutton.setAttribute('http_nowhere',
                                showHttpNowhere ? 'true' : 'false');
+    var enabled = HTTPSEverywhere.prefs.getBoolPref("globalEnabled");
+    httpNowhereItem.setAttribute('disabled', enabled ? 'false' : 'true');
 
     // show ruleset counter when a tab is changed
     tb.updateRulesetsApplied();
@@ -228,9 +230,11 @@ httpsEverywhere.toolbarButton = {
    * Toggles whether HTTP Nowhere mode is active, updates the toolbar icon.
    */
   toggleHttpNowhere: function() {
-    var tb = httpsEverywhere.toolbarButton;
     HTTPSEverywhere.toggleHttpNowhere();
+    var tb = httpsEverywhere.toolbarButton;
     var showHttpNowhere = tb.shouldShowHttpNowhere();
+
+    // Change icon color to red if HTTP nowhere is enabled
     var toolbarbutton = document.getElementById('https-everywhere-button');
     toolbarbutton.setAttribute('http_nowhere',
                                showHttpNowhere ? 'true' : 'false');
@@ -353,6 +357,11 @@ function toggleEnabledState(){
 	HTTPSEverywhere.toggleEnabledState();
 	reload_window();	
 
+  // Disable/enable toggling HTTP Nowhere mode
+  var httpNowhereItem = document.getElementById('http-nowhere-item');
+  var enabled = HTTPSEverywhere.prefs.getBoolPref("globalEnabled");
+  httpNowhereItem.setAttribute('disabled', enabled ? 'false' : 'true');
+
   // Change icon depending on enabled state
   httpsEverywhere.toolbarButton.changeIcon();
 }
