diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/base/content/tabbrowser.js
index f1d264d84fec8..ca0367a34ca23 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -5641,14 +5641,14 @@
case ShortcutUtils.NEXT_TAB:
if (AppConstants.platform == "macosx") {
- this.tabContainer.advanceSelectedTab(1, true);
- aEvent.preventDefault();
+// this.tabContainer.advanceSelectedTab(1, true);
+// aEvent.preventDefault();
}
break;
case ShortcutUtils.PREVIOUS_TAB:
if (AppConstants.platform == "macosx") {
- this.tabContainer.advanceSelectedTab(-1, true);
- aEvent.preventDefault();
+// this.tabContainer.advanceSelectedTab(-1, true);
+// aEvent.preventDefault();
}
break;
}
diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
index 997e8413f2a22..178c1dee73632 100644
--- a/toolkit/content/widgets/tabbox.js
+++ b/toolkit/content/widgets/tabbox.js
@@ -134,20 +134,20 @@
true
);
if (this.tabs && this.handleCtrlTab) {
- this.tabs.advanceSelectedTab(event.shiftKey ? -1 : 1, true);
- event.preventDefault();
+// this.tabs.advanceSelectedTab(event.shiftKey ? -1 : 1, true);
+// event.preventDefault();
}
break;
case ShortcutUtils.PREVIOUS_TAB:
if (this.tabs) {
- this.tabs.advanceSelectedTab(-1, true);
- event.preventDefault();
+// this.tabs.advanceSelectedTab(-1, true);
+// event.preventDefault();
}
break;
case ShortcutUtils.NEXT_TAB:
if (this.tabs) {
- this.tabs.advanceSelectedTab(1, true);
- event.preventDefault();
+ // this.tabs.advanceSelectedTab(1, true);
+// event.preventDefault();
}
break;
}
diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
index 01c7ed0125d69..33c915f3e3cf5 100644
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -3379,6 +3379,12 @@ void EventStateManager::PostHandleKeyboardEvent(
EnsureDocument(presContext);
nsFocusManager* fm = nsFocusManager::GetFocusManager();
if (fm && mDocument) {
+
+ // We don't care about tab movement, it's handled by Sidebery
+ if (aKeyboardEvent->IsControl() && aKeyboardEvent->mKeyCode == NS_VK_TAB) {
+ return;
+ }
+
// Shift focus forward or back depending on shift key
bool isDocMove = aKeyboardEvent->IsControl() ||
aKeyboardEvent->mKeyCode == NS_VK_F6;
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index d08984b796330..3b32785b3b3cc 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -32,7 +32,7 @@
-
+#
@@ -73,8 +73,8 @@
-
-
+#
+#
@@ -167,7 +167,7 @@
modifiers="accel"
#endif
command="Tools:Downloads"/>
-
+#
@@ -179,13 +179,8 @@
modifiers="accel"
internal="true"/>
#else
-
+
@@ -341,15 +336,15 @@
#define NUM_SELECT_TAB_MODIFIER accel
#endif
-#expand
-#expand
-#expand
-#expand
-#expand
-#expand
-#expand
-#expand
-#expand
+# #expand
+# #expand
+# #expand
+# #expand
+# #expand
+# #expand
+# #expand
+# #expand
+# #expand
-
+
diff --git a/dom/events/ShortcutKeyDefinitions.cpp b/dom/events/ShortcutKeyDefinitions.cpp
index 3f34f45240444..bdf404b1e90b0 100644
--- a/dom/events/ShortcutKeyDefinitions.cpp
+++ b/dom/events/ShortcutKeyDefinitions.cpp
@@ -176,7 +176,7 @@ ShortcutKeyData ShortcutKeys::sInputHandlers[] = {
{u"keypress", nullptr, u"x", u"accel", u"cmd_cut"}, // Win, macOS, Linux, Android, Emacs
{u"keypress", nullptr, u"v", u"accel", u"cmd_paste"}, // Win, macOS, Linux, Android, Emacs
{u"keypress", nullptr, u"z", u"accel", u"cmd_undo"}, // Win, macOS, Linux, Android, Emacs
- {u"keypress", nullptr, u"z", u"accel,shift", u"cmd_redo"}, // Win, macOS, Linux, Android, Emacs
+ {u"keypress", nullptr, u"y", u"accel", u"cmd_redo"}, // Win, macOS, Linux, Android, Emacs
{u"keypress", nullptr, u"v", u"accel,shift", u"cmd_paste"}, // Win, macOS, Linux, Android, Emacs
// Mac uses Option+Shift+Command+V for Paste and Match Style
@@ -184,11 +184,6 @@ ShortcutKeyData ShortcutKeys::sInputHandlers[] = {
{u"keypress", nullptr, u"v", u"accel,alt,shift", u"cmd_paste"}, // macOS
#endif // MOZ_WIDGET_COCOA
-#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) ||\
- defined(USE_EMACS_KEY_BINDINGS)
- {u"keypress", nullptr, u"y", u"accel", u"cmd_redo"}, // Win, Linux, Emacs
-#endif // XP_WIN || MOZ_WIDGET_GTK || USE_EMACS_KEY_BINDINGS
-
#if defined(XP_WIN) || defined(MOZ_WIDGET_COCOA) || defined(MOZ_WIDGET_GTK) ||\
defined(MOZ_WIDGET_ANDROID)
{u"keypress", nullptr, u"a", u"accel", u"cmd_selectAll"}, // Win, macOS, Linux, Android
@@ -365,12 +360,7 @@ ShortcutKeyData ShortcutKeys::sTextAreaHandlers[] = {
{u"keypress", nullptr, u"x", u"accel", u"cmd_cut"}, // Win, macOS, Linux, Android, Emacs
{u"keypress", nullptr, u"v", u"accel", u"cmd_paste"}, // Win, macOS, Linux, Android, Emacs
{u"keypress", nullptr, u"z", u"accel", u"cmd_undo"}, // Win, macOS, Linux, Android, Emacs
- {u"keypress", nullptr, u"z", u"accel,shift", u"cmd_redo"}, // Win, macOS, Linux, Android, Emacs
-
-#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) ||\
- defined(USE_EMACS_KEY_BINDINGS)
- {u"keypress", nullptr, u"y", u"accel", u"cmd_redo"}, // Win, Linux, Emacs
-#endif // XP_WIN || MOZ_WIDGET_GTK || USE_EMACS_KEY_BINDINGS
+ {u"keypress", nullptr, u"y", u"accel", u"cmd_redo"}, // Win, macOS, Linux, Android, Emacs
#if defined(XP_WIN) || defined(MOZ_WIDGET_COCOA) || defined(MOZ_WIDGET_GTK) ||\
defined(MOZ_WIDGET_ANDROID)
@@ -561,17 +551,13 @@ ShortcutKeyData ShortcutKeys::sBrowserHandlers[] = {
{u"keypress", nullptr, u"v", u"accel", u"cmd_paste"}, // Win, macOS, Linux, Android, Emacs
{u"keypress", nullptr, u"v", u"accel,shift", u"cmd_pasteNoFormatting"}, // Win, macOS, Linux, Android, Emacs
{u"keypress", nullptr, u"z", u"accel", u"cmd_undo"}, // Win, macOS, Linux, Android, Emacs
- {u"keypress", nullptr, u"z", u"accel,shift", u"cmd_redo"}, // Win, macOS, Linux, Android, Emacs
+ {u"keypress", nullptr, u"y", u"accel", u"cmd_redo"}, // Win, macOS, Linux, Android, Emacs
// Mac uses Option+Shift+Command+V for Paste and Match Style
#if defined(MOZ_WIDGET_COCOA)
{u"keypress", nullptr, u"v", u"accel,alt,shift", u"cmd_pasteNoFormatting"}, // macOS
#endif // MOZ_WIDGET_COCOA
-#if defined(XP_WIN)
- {u"keypress", nullptr, u"y", u"accel", u"cmd_redo"}, // Win
-#endif // XP_WIN
-
{u"keypress", nullptr, u"a", u"accel", u"cmd_selectAll"}, // Win, macOS, Linux, Android, Emacs
#if defined(USE_EMACS_KEY_BINDINGS)
{u"keypress", nullptr, u"a", u"alt", u"cmd_selectAll"}, // Emacs
@@ -730,18 +716,13 @@ ShortcutKeyData ShortcutKeys::sEditorHandlers[] = {
{u"keypress", nullptr, u"v", u"accel", u"cmd_paste"}, // Win, macOS, Linux, Android, Emacs
{u"keypress", nullptr, u"v", u"accel,shift", u"cmd_pasteNoFormatting"}, // Win, macOS, Linux, Android, Emacs
{u"keypress", nullptr, u"z", u"accel", u"cmd_undo"}, // Win, macOS, Linux, Android, Emacs
- {u"keypress", nullptr, u"z", u"accel,shift", u"cmd_redo"}, // Win, macOS, Linux, Android, Emacs
+ {u"keypress", nullptr, u"y", u"accel", u"cmd_redo"}, // Win, macOS, Linux, Android, Emacs
// Mac uses Option+Shift+Command+V for Paste and Match Style
#if defined(MOZ_WIDGET_COCOA)
{u"keypress", nullptr, u"v", u"accel,alt,shift", u"cmd_pasteNoFormatting"}, // macOS
#endif // MOZ_WIDGET_COCOA
-#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) ||\
- defined(USE_EMACS_KEY_BINDINGS)
- {u"keypress", nullptr, u"y", u"accel", u"cmd_redo"}, // Emacs
-#endif // XP_WIN || MOZ_WIDGET_GTK || USE_EMACS_KEY_BINDINGS
-
#if defined(XP_WIN) || defined(MOZ_WIDGET_COCOA) || defined(MOZ_WIDGET_GTK) ||\
defined(MOZ_WIDGET_ANDROID)
{u"keypress", nullptr, u"a", u"accel", u"cmd_selectAll"}, // Win, macOS, Linux, Android