Bug 656045 - Attachment bar actions should be disabled if only a text/x-moz-deleted attachment is present (fix fallout); r=bwinton

mail/base/content/mailWindowOverlay.js

@@ -1961,7 +1961,7 @@ function UpdateJunkButton()
   if (!gFolderDisplay.getCommandStatus(nsMsgViewCommandType.junk))
     hideJunk = true;
   if (document.getElementById('hdrJunkButton')) {
-    document.getElementById('hdrJunkButton').hidden = hideJunk;
+    document.getElementById('hdrJunkButton').disabled = hideJunk;
   }
 }
 

mail/themes/gnomestripe/mail/messageHeader.css

@@ -227,6 +227,10 @@ description[selectable="true"]:focus > descriptionitem[selected="true"] {
   margin: 0 !important;
 }
 
+#header-view-toolbar .msgHeaderView-button[disabled="true"] {
+  display: none;
+}
+
 .dateLabel {
   -moz-padding-end: 3px;
   -moz-user-select: text;
@@ -366,11 +370,6 @@ toolbar[iconsize="small"] .hdrJunkButton {
   -moz-image-region: rect(0px 128px 16px 112px);
 }
 
-.hdrJunkButton[disabled="true"] {
-  background: none;
-  opacity: 0;
-}
-
 .hdrTrashButton {
   list-style-image: url("moz-icon://stock/gtk-delete?size=toolbar");
 }

mail/themes/pinstripe/mail/messageHeader.css

@@ -271,6 +271,10 @@ description[selectable="true"]:focus > descriptionitem[selected="true"] {
   margin: 0;
 }
 
+#header-view-toolbar .msgHeaderView-button[disabled="true"] {
+  display: none;
+}
+
 #dateLabel {
   -moz-padding-end: 3px;
   -moz-user-select: text;
@@ -425,11 +429,6 @@ toolbarpaletteitem > #hdrReplyToSenderButton {
   -moz-image-region: rect(0px, 112px, 16px, 96px);
 }
 
-.junkButton[disabled="true"] {
-  background: none;
-  opacity: 0;
-}
-
 .hdrJunkButton {
   /* large icons are only needed for customization dialog, so use here also small icons */
   list-style-image: url("chrome://messenger/skin/icons/message-header-toolbar.png");

mail/themes/qute/mail/messageHeader-aero.css

@@ -267,6 +267,10 @@ description[selectable="true"]:focus > descriptionitem[selected="true"] {
   }
 }
 
+#header-view-toolbar .msgHeaderView-button[disabled="true"] {
+  display: none;
+}
+
 .dateLabel {
   -moz-padding-end: 3px;
   -moz-user-select: text;
@@ -402,11 +406,6 @@ toolbarpaletteitem > #hdrReplyToSenderButton {
   -moz-image-region: rect(0px, 162px, 18px, 144px);
 }
 
-.hdrJunkButton[disabled="true"] {
-  background: none;
-  opacity: 0;
-}
-
 .hdrTrashButton {
   list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
   -moz-image-region: rect(0px, 144px, 18px, 126px);

mail/themes/qute/mail/messageHeader.css

@@ -243,6 +243,10 @@ description[selectable="true"]:focus > descriptionitem[selected="true"] {
   margin: 0 !important;
 }
 
+#header-view-toolbar .msgHeaderView-button[disabled="true"] {
+  display: none;
+}
+
 .dateLabel {
   -moz-padding-end: 3px;
   -moz-user-select: text;
@@ -400,11 +404,6 @@ toolbar[iconsize="small"] .hdrJunkButton {
   -moz-image-region: rect(0px 144px 16px 128px);
 }
 
-.hdrJunkButton[disabled="true"] {
-  background: none;
-  opacity: 0;
-}
-
 .hdrTrashButton {
   list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
   -moz-image-region: rect(0px 192px 24px 168px);