Bug 1597061 - Fix error message in console when using F6 in stand-alone mail window. r=mkmelin
authorKhushil Mistry <khushil324@gmail.com>
Wed, 20 Nov 2019 17:34:53 +1300
changeset 37570 afee24ca2f118226ecb57602882f9fa5469ba7b1
parent 37569 11e9e7a7d60dc8d1d90db490851bc5f012150623
child 37571 a9f2973479f1a5f89d650019584aa214f501d945
push id396
push userclokep@gmail.com
push dateMon, 06 Jan 2020 23:11:57 +0000
reviewersmkmelin
bugs1597061
Bug 1597061 - Fix error message in console when using F6 in stand-alone mail window. r=mkmelin
mail/base/content/mainKeySet.inc.xul
mail/base/content/messenger.xul
--- a/mail/base/content/mainKeySet.inc.xul
+++ b/mail/base/content/mainKeySet.inc.xul
@@ -133,24 +133,16 @@
     <key                          key="&fullZoomEnlargeCmd.commandkey3;"
          command="cmd_fullZoomEnlarge" modifiers="accel"/>
     <key id="key_fullZoomReset"   key="&fullZoomResetCmd.commandkey;"
          command="cmd_fullZoomReset"   modifiers="accel"/>
     <key                          key="&fullZoomResetCmd.commandkey2;"
          command="cmd_fullZoomReset"   modifiers="accel"/>
   </keyset>
 
-  <!-- Tab/F6 Keys -->
-  <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
-  <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
-  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
-  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
-  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="shift"/>
-  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);"/>
-
   <!-- View Toggle Keys (F8) -->
   <key id="key_toggleMessagePane" keycode="VK_F8" oncommand="goDoCommand('cmd_toggleMessagePane');"/>
 
   <!-- Tag Keys -->
   <!-- Includes both shifted and not, for Azerty and other layouts where the
        numeric keys are shifted. -->
   <key id="key_tag0" key="&tagCmd0.key;" modifiers="shift any"
        oncommand="goDoCommand('cmd_removeTags');"/>
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -220,16 +220,23 @@
   <commandset id="tasksCommands">
     <command id="cmd_newMessage" oncommand="goOpenNewMessage();"/>
     <command id="cmd_newCard" oncommand="openNewCardDialog()"/>
   </commandset>
   <command id="cmd_close" oncommand="CloseTabOrWindow();"/>
 </commandset>
 
 <keyset id="mailKeys">
+  <!-- Tab/F6 Keys -->
+  <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
+  <key keycode="VK_TAB" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
+  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control,shift"/>
+  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="control"/>
+  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);" modifiers="shift"/>
+  <key keycode="VK_F6" oncommand="SwitchPaneFocus(event);"/>
 #include mainKeySet.inc.xul
   <keyset id="tasksKeys">
 #ifdef XP_MACOSX
     <key id="key_newMessage" key="&newMessageCmd.key;" command="cmd_newMessage"
          modifiers="accel,shift"/>
     <key id="key_newMessage2" key="&newMessageCmd2.key;" command="cmd_newMessage"
          modifiers="accel"/>
 #else