Bug 291110 - restore the old behavior of cmd_copyImageContents. r=bzbarsky, sr=neil, a=asa

dom/src/base/nsGlobalWindowCommands.cpp

@@ -66,6 +66,7 @@ const char * const sSelectAllString = "cmd_selectAll";
 const char * const sSelectNoneString = "cmd_selectNone";
 const char * const sCopyImageLocationString = "cmd_copyImageLocation";
 const char * const sCopyImageContentsString = "cmd_copyImageContents";
+const char * const sCopyImageString = "cmd_copyImage";
 
 const char * const sScrollTopString = "cmd_scrollTop";
 const char * const sScrollBottomString = "cmd_scrollBottom";
@@ -604,6 +605,8 @@ nsClipboardImageCommands::DoClipboardCommand(const char *aCommandName, nsIConten
 {
   if (!nsCRT::strcmp(sCopyImageLocationString, aCommandName))
     return aEdit->CopyImage(nsIContentViewerEdit::COPY_IMAGE_TEXT);
+  if (!nsCRT::strcmp(sCopyImageContentsString, aCommandName))
+    return aEdit->CopyImage(nsIContentViewerEdit::COPY_IMAGE_DATA);
 
   PRInt32 copyFlags = nsIContentViewerEdit::COPY_IMAGE_ALL;
   if (aParams)
@@ -965,7 +968,8 @@ nsWindowCommandRegistration::RegisterWindowCommands(
   NS_REGISTER_ONE_COMMAND(nsClipboardPasteCommand, "cmd_paste");
   NS_REGISTER_ONE_COMMAND(nsClipboardCopyLinkCommand, "cmd_copyLink");
   NS_REGISTER_FIRST_COMMAND(nsClipboardImageCommands, sCopyImageLocationString);
-  NS_REGISTER_LAST_COMMAND(nsClipboardImageCommands, sCopyImageContentsString);
+  NS_REGISTER_NEXT_COMMAND(nsClipboardImageCommands, sCopyImageContentsString);
+  NS_REGISTER_LAST_COMMAND(nsClipboardImageCommands, sCopyImageString);
   NS_REGISTER_FIRST_COMMAND(nsClipboardSelectAllNoneCommands, sSelectAllString);
   NS_REGISTER_LAST_COMMAND(nsClipboardSelectAllNoneCommands, sSelectNoneString);
 

extensions/help/resources/content/help.xul

@@ -47,8 +47,6 @@
     <command id="Browser:Back"    oncommand="goBack();"    observes="canGoBack"/>
     <command id="Browser:Forward" oncommand="goForward();" observes="canGoForward"/>
     <command id="cmd_copyLink"/>
-    <command id="cmd_copyImageLocation"/>
-    <command id="cmd_copyImageContents"/>
   </commandset>
   <commandset id="clipboardEditMenuItems"/>
   <commandset id="viewZoomCommands"/>

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -200,8 +200,7 @@
 
 <commandset id="mailEditContextMenuItems">
   <command id="cmd_copyLink"/>
-  <command id="cmd_copyImageLocation"/>
-  <command id="cmd_copyImageContents"/>
+  <command id="cmd_copyImage"/>
 </commandset>
 
 <commandset id="mailGoMenuItems"
@@ -1007,7 +1006,7 @@
         <menuitem id="context-copyimage"
                   label="&copyImageCmd.label;"
                   accesskey="&copyImageCmd.accesskey;"
-                  command="cmd_copyImageContents"/>
+                  command="cmd_copyImage"/>
         <menuitem id="context-copyemail"
                   label="&copyEmailCmd.label;"
                   accesskey="&copyEmailCmd.accesskey;"

xpfe/browser/resources/content/navigatorOverlay.xul

@@ -158,8 +158,7 @@
 
     <!-- Content area context menu -->
     <command id="cmd_copyLink"/>
-    <command id="cmd_copyImageLocation"/>
-    <command id="cmd_copyImageContents"/>
+    <command id="cmd_copyImage"/>
 
     <!-- View Menu -->
     <command id="View:PageSource" oncommand="BrowserViewSourceOfDocument(content.document);" observes="isImage"/>

xpfe/communicator/resources/content/contentAreaContextOverlay.xul

@@ -113,7 +113,7 @@
       <menuitem id="context-copyimage"
                 label="&copyImageCmd.label;"
                 accesskey="&copyImageCmd.accesskey;"
-                command="cmd_copyImageContents"/>
+                command="cmd_copyImage"/>
       <menuseparator id="context-sep-copyimage"/>
       <menuitem id="context-saveimage"
                 valueSaveAs="&saveImageAsCmd.label;"

xpfe/communicator/resources/content/utilityOverlay.xul

@@ -225,11 +225,8 @@
   <command id="cmd_copyLink"
            oncommand="goDoCommand('cmd_copyLink')"
            disabled="false"/>
-  <command id="cmd_copyImageLocation"
-           oncommand="goDoCommand('cmd_copyImageLocation')"
-           disabled="false"/>
-  <command id="cmd_copyImageContents"
-           oncommand="goDoCommand('cmd_copyImageContents')"
+  <command id="cmd_copyImage"
+           oncommand="goDoCommand('cmd_copyImage')"
            disabled="false"/>
   <command id="cmd_undo" 
            oncommand="goDoCommand('cmd_undo')"