Merge pull request EFForg#2231 from EFForg/disable-disable-menuitem

diracdeltas · diracdeltas · commit 78a9a43e73e7 · 2015-07-22T11:58:17.000-07:00
Add disabled attribute to Enable/Disable rules.
diff --git a/src/chrome/content/code/ApplicableList.js b/src/chrome/content/code/ApplicableList.js
@@ -113,6 +113,9 @@ ApplicableList.prototype = {
     // and disable rules.
     var label = document.createElement('menuitem');
     label.setAttribute('label', strings.getString('https-everywhere.menu.enableDisable'));
+    label.setAttribute('disabled', 'true');
+    label.setAttribute('class', 'menuitem-non-iconic');
+    label.setAttribute('style', 'color:#000000;');
     var label2 = false;
     if (!any_rules) {
       label2 = document.createElement('menuitem');
diff --git a/src/chrome/content/toolbar_button.xul b/src/chrome/content/toolbar_button.xul
@@ -53,8 +53,6 @@
         <menuseparator />
         <menuitem label="&https-everywhere.menu.observatory;" command="https-everywhere-menuitem-observatory" />
         <menuitem label="&https-everywhere.menu.about;" command="https-everywhere-menuitem-about" />
-        <menuitem type="checkbox" class="birthday menuitem-iconic" image="chrome://https-everywhere/skin/eff-16.png"
-          label="Happy 25th birthday, EFF!" command="https-everywhere-menuitem-birthday" />
       </menupopup>
     </toolbarbutton>
   </toolbarpalette>
