Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Firefox: use ctrl-j to open downloads on Linux
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index c90f3aa340ef..fcd9f17e9971 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -129,11 +129,10 @@
#
# Search Command Key Logic works like this:
#
-# Unix: Ctrl+K (cross platform binding)
-# Ctrl+J (in case of emacs Ctrl-K conflict)
# Mac: Cmd+K (cross platform binding)
# Cmd+Opt+F (platform convention)
-# Win: Ctrl+K (cross platform binding)
+# Win,
+# Unix: Ctrl+K (cross platform binding)
# Ctrl+E (IE compat)
#
# We support Ctrl+K on all platforms now and advertise it in the menu since it is
@@ -146,16 +145,10 @@
<key id="key_search" key="&searchFocus.commandkey;" command="Tools:Search" modifiers="accel"/>
#ifdef XP_MACOSX
<key id="key_search2" key="&findOnCmd.commandkey;" command="Tools:Search" modifiers="accel,alt"/>
-#endif
-#ifdef XP_WIN
+#else
<key id="key_search2" key="&searchFocus.commandkey2;" command="Tools:Search" modifiers="accel"/>
#endif
-#ifdef XP_GNOME
- <key id="key_search2" key="&searchFocusUnix.commandkey;" command="Tools:Search" modifiers="accel"/>
- <key id="key_openDownloads" key="&downloadsUnix.commandkey;" command="Tools:Downloads" modifiers="accel,shift"/>
-#else
<key id="key_openDownloads" key="&downloads.commandkey;" command="Tools:Downloads" modifiers="accel"/>
-#endif
<key id="key_openAddons" key="&addons.commandkey;" command="Tools:Addons" modifiers="accel,shift"/>
<key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile" modifiers="accel"/>
<key id="key_savePage" key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 23adf77a5a84..0597903f781a 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -209,7 +209,6 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
- downloads.label, but used in the Library panel. -->
<!ENTITY libraryDownloads.label "Downloads">
<!ENTITY downloads.commandkey "j">
-<!ENTITY downloadsUnix.commandkey "y">
<!ENTITY addons.label "Add-ons">
<!ENTITY addons.commandkey "A">
@@ -370,7 +369,6 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
-->
<!ENTITY searchFocus.commandkey "k">
<!ENTITY searchFocus.commandkey2 "e">
-<!ENTITY searchFocusUnix.commandkey "j">
<!ENTITY contentSearchSubmit.tooltip "Submit search">
diff --git a/testing/firefox-ui/tests/functional/keyboard_shortcuts/test_browser_window.py b/testing/firefox-ui/tests/functional/keyboard_shortcuts/test_browser_window.py
index d732981e154f..5bf980fa0878 100644
--- a/testing/firefox-ui/tests/functional/keyboard_shortcuts/test_browser_window.py
+++ b/testing/firefox-ui/tests/functional/keyboard_shortcuts/test_browser_window.py
@@ -41,10 +41,7 @@ class TestBrowserWindowShortcuts(PuppeteerMixin, MarionetteTestCase):
self.assertNotEqual(current_name, "input")
# TODO: To be moved to the upcoming search library
- if self.marionette.session_capabilities['platformName'] == 'linux':
- key = 'searchFocusUnix.commandkey'
- else:
- key = 'searchFocus.commandkey'
+ key = 'searchFocus.commandkey'
self.browser.send_shortcut(self.browser.localize_entity(key),
accel=True)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.