Back out part of bug 611458 due to unit test bustage.
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 05 Jul 2011 21:16:32 +0100
changeset 8275 72f40b7e9357b68a2fe8ca356e5aba049604ff9c
parent 8274 8c885c3fc9acbf97cfd9d6044137f62cc379bdf0
child 8276 2f5b60440770e4c8a01a7d691441a29b9a6152de
push id84
push userbugzilla@standard8.plus.com
push dateTue, 16 Aug 2011 21:25:04 +0000
treeherdercomm-beta@6970c86be3cd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs611458
Back out part of bug 611458 due to unit test bustage.
mail/base/content/mail3PaneWindowCommands.js
--- a/mail/base/content/mail3PaneWindowCommands.js
+++ b/mail/base/content/mail3PaneWindowCommands.js
@@ -352,20 +352,22 @@ var DefaultController =
           goSetAccessKey(command, whichText + "AccessKey");
         }
         if (numSelected > 0)
         {
           if (!gFolderDisplay.getCommandStatus(nsMsgViewCommandType.cmdRequiringMsgBody))
             return false;
 
           // Check if we have a collapsed thread selected and are summarizing it.
-          // Also check that we're not displaying a message, which handles the
-          // case where we failed to summarize the selection and fell back to
-          // displaying a message.
-          if (!gMessageDisplay.singleMessageDisplay && command != "cmd_applyFiltersToSelection")
+          // If so, selectedIndices.length won't match numSelected. Also check
+          // that we're not displaying a message, which handles the case
+          // where we failed to summarize the selection and fell back to                  // displaying a message.
+          if (gFolderDisplay.selectedIndices.length != numSelected &&
+              command != "cmd_applyFiltersToSelection" &&
+              gDBView && gDBView.currentlyDisplayedMessage == nsMsgViewIndex_None)
             return false;
           if (command == "cmd_reply" || command == "button_reply" ||
               command == "cmd_replyall" ||command == "button_replyall")
             return IsReplyEnabled();
           if (command == "cmd_replylist" || command == "button_replylist")
             return IsReplyListEnabled();
           return true;
         }