Bug 638607 - Remove obsolete cmd_showComposeToolbar
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 07 Mar 2011 22:27:26 +0000
changeset 7274 d44493086a5586709f7a545258abd92b5a572a34
parent 7273 e8fbd1c2abcbedef62d95c5cc7c82fe6cdddbc0a
child 7275 8b84ba7d972a7901a6ea4072a2a15c92f7fad650
push idunknown
push userunknown
push dateunknown
bugs638607
Bug 638607 - Remove obsolete cmd_showComposeToolbar r=Standard8
mail/components/compose/content/MsgComposeCommands.js
mail/components/compose/content/messengercompose.xul
--- a/mail/components/compose/content/MsgComposeCommands.js
+++ b/mail/components/compose/content/MsgComposeCommands.js
@@ -414,17 +414,16 @@ var defaultController =
       //Edit Menu
       case "cmd_delete":
       case "cmd_renameAttachment":
       case "cmd_selectAll":
       case "cmd_openAttachment":
       case "cmd_account":
 
       //View Menu
-      case "cmd_showComposeToolbar":
       case "cmd_showFormatToolbar":
 
       //Options Menu
       case "cmd_outputFormat":
       case "cmd_quoteMessage":
         return true;
 
       default:
@@ -480,18 +479,16 @@ var defaultController =
         return MessageHasAttachments();
       case "cmd_openAttachment":
         return MessageGetNumSelectedAttachments() == 1;
       case "cmd_renameAttachment":
         return MessageGetNumSelectedAttachments() == 1;
       case "cmd_account":
 
       //View Menu
-      case "cmd_showComposeToolbar":
-        return true;
       case "cmd_showFormatToolbar":
         return composeHTML;
 
       //Options Menu
       case "cmd_outputFormat":
         return composeHTML;
       case "cmd_quoteMessage":
         var selectedURIs = GetSelectedMessages();
@@ -535,17 +532,16 @@ var defaultController =
       //Edit Menu
       case "cmd_delete"             : if (MessageGetNumSelectedAttachments()) RemoveSelectedAttachment();         break;
       case "cmd_renameAttachment"   : if (MessageGetNumSelectedAttachments() == 1) RenameSelectedAttachment(); break;
       case "cmd_selectAll"          : if (MessageHasAttachments()) SelectAllAttachments();                     break;
       case "cmd_openAttachment"     : if (MessageGetNumSelectedAttachments() == 1) OpenSelectedAttachment();          break;
       case "cmd_account"            : MsgAccountManager(null); break;
 
       //View Menu
-      case "cmd_showComposeToolbar" : goToggleToolbar('composeToolbar2', 'menu_showComposeToolbar'); break;
       case "cmd_showFormatToolbar"  : goToggleToolbar('FormatToolbar', 'menu_showFormatToolbar');   break;
 
       //Options Menu
       case "cmd_quoteMessage"       : if (defaultController.isCommandEnabled(command)) QuoteSelectedMessage();  break;
       default:
 //        dump("##MsgCompose: don't know what to do with command " + command + "!\n");
         return;
     }
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -153,17 +153,16 @@
   <command id="cmd_rewrap" oncommand="goDoCommand('cmd_rewrap')"/>
   <command id="cmd_delete" oncommand="goDoCommand('cmd_delete')" valueDefault="&deleteCmd.label;" valueDefaultAccessKey="&deleteCmd.accesskey;" valueRemoveAttachmentAccessKey="&removeAttachment.accesskey;" disabled="true"/>
   <command id="cmd_renameAttachment" oncommand="goDoCommand('cmd_renameAttachment')" disabled="true"/>
   <command id="cmd_selectAll" oncommand="goDoCommand('cmd_selectAll')" disabled="true"/>
   <command id="cmd_openAttachment" oncommand="goDoCommand('cmd_openAttachment')" disabled="true"/>  
   <command id="cmd_account" oncommand="goDoCommand('cmd_account')"/>
 
   <!-- View Menu -->
-  <command id="cmd_showComposeToolbar" oncommand="goDoCommand('cmd_showComposeToolbar')"/>
   <command id="cmd_showFormatToolbar" oncommand="goDoCommand('cmd_showFormatToolbar')"/>
 
   <!-- Options Menu -->
   <command id="cmd_quoteMessage" oncommand="goDoCommand('cmd_quoteMessage')"/>
   <command id="cmd_insert"/>
 
 #ifdef XP_MACOSX
   <!-- Mac Window menu -->