Bug 1597674 - In standalone mail window F6 and TAB generates error message in console. r=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 24 Nov 2019 13:34:08 +0100
changeset 36718 afd0e7a81c043078d25b3648cd14cf0b52db5688
parent 36717 64a1253ed5a8661694a2072af61697b28dee2f1e
child 36719 fa4e46e2039322a6c22b6494fc5c66d747ce1b3f
push id2534
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:52:51 +0000
treeherdercomm-beta@055c50840778 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg
bugs1597674
Bug 1597674 - In standalone mail window F6 and TAB generates error message in console. r=frg
suite/mailnews/content/mailWindowOverlay.xul
suite/mailnews/content/messenger.xul
--- a/suite/mailnews/content/mailWindowOverlay.xul
+++ b/suite/mailnews/content/mailWindowOverlay.xul
@@ -365,24 +365,16 @@
        modifiers="accel, shift"/>
   <keyset id="findKeys"/>
   <key id="key_findTypeText"/>
   <key id="key_findTypeLinks"/>
   <key id="key_stop" keycode="VK_ESCAPE" command="cmd_stop"/>
   <keyset id="viewZoomKeys"/>
   <key id="key_reload"/>
 
-  <!-- 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 -->
   <key id="key_toggleFolderPane"
        oncommand="MsgToggleFolderPane(true);"
        observes="mailDisableKeys"/>
   <key id="key_toggleThreadPane"
        keycode="VK_F8"
        modifiers="shift"
        oncommand="MsgToggleThreadPane();"
--- a/suite/mailnews/content/messenger.xul
+++ b/suite/mailnews/content/messenger.xul
@@ -86,16 +86,24 @@
   <broadcaster id="mailDisableViewsSearch" disabled="true"/>
   <!-- File Menu -->
   <broadcaster id="Communicator:WorkMode"/>
 </broadcasterset>
 
 <broadcasterset id="mainBroadcasterSet"/>
 
 <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);"/>
+
   <keyset id="tasksKeys"/>
 </keyset>
 
   <popupset id="mainPopupSet">
     <menupopup id="mailContext"/>
     <menupopup id="folderPaneContext"/>
     <menupopup id="attachmentListContext"/>
     <tooltip id="attachmentListTooltip"/>