Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update keyboard shortcuts for switching tabs #2566

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update keyboard shortcuts for switching tabs #2566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
518c49e
add shift+mod+brackets as default shortcut
PalmerAL Feb 12, 2025
bd602e2
Update cmd+number shortcuts to be consistent with other browsers
PalmerAL Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions js/defaultKeybindings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ var focusMode = require('focusMode.js')
var modalMode = require('modalMode.js')
var tabEditor = require('navbar/tabEditor.js')
var urlParser = require('util/urlParser.js')
var keyMapModule = require('util/keyMap.js')
var settings = require('util/settings/settings.js')

var keyMap = keyMapModule.userKeyMap(settings.get('keyMap'))

const defaultKeybindings = {
initialize: function () {
Expand Down Expand Up @@ -113,17 +117,13 @@ const defaultKeybindings = {

for (var i = 1; i < 9; i++) {
(function (i) {
keybindings.defineShortcut({ keys: 'mod+' + i }, function (e) {
var currentIndex = tabs.getIndex(tabs.getSelected())
var newTab = tabs.getAtIndex(currentIndex + i) || tabs.getAtIndex(currentIndex - i)
if (newTab) {
browserUI.switchToTab(newTab.id)
}
})
// cmd+1 switched to the next tab in versions <= 1.34. If it is set as a custom shortcut to match this behavior, don't register the default shortcut.
if (i === 1 && (keyMap.switchToNextTab === 'mod+1' || (keyMap.switchToNextTab instanceof Array && keyMap.switchToNextTab.includes('mod+1')))) {
return
}

keybindings.defineShortcut({ keys: 'shift+mod+' + i }, function (e) {
var currentIndex = tabs.getIndex(tabs.getSelected())
var newTab = tabs.getAtIndex(currentIndex - i) || tabs.getAtIndex(currentIndex + i)
keybindings.defineShortcut({ keys: 'mod+' + i }, function (e) {
var newTab = tabs.getAtIndex(i - 1)
if (newTab) {
browserUI.switchToTab(newTab.id)
}
Expand Down
4 changes: 2 additions & 2 deletions js/util/keyMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ var defaultKeyMap = {
addToFavorites: 'mod+d',
showBookmarks: 'shift+mod+b',
toggleReaderView: 'shift+mod+r',
switchToNextTab: ['option+mod+right', 'ctrl+tab', 'shift+mod+pagedown'],
switchToPreviousTab: ['option+mod+left', 'shift+ctrl+tab', 'shift+mod+pageup'],
switchToNextTab: ['option+mod+right', 'ctrl+tab', 'shift+mod+pagedown', 'shift+mod+]'],
switchToPreviousTab: ['option+mod+left', 'shift+ctrl+tab', 'shift+mod+pageup', 'shift+mod+['],
moveTabLeft: 'option+mod+shift+left',
moveTabRight: 'option+mod+shift+right',
switchToNextTask: 'mod+]',
Expand Down