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

[keybinding] Duplicate keybinding for opening the preferences widget and deleting file on navigator #8256

Merged
merged 1 commit into from
Aug 3, 2020
Merged

[keybinding] Duplicate keybinding for opening the preferences widget and deleting file on navigator #8256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions packages/navigator/src/browser/navigator-contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,16 +442,9 @@ export class FileNavigatorContribution extends AbstractViewContribution<FileNavi

registry.registerKeybinding({
command: WorkspaceCommands.FILE_DELETE.id,
keybinding: 'del',
keybinding: isOSX ? 'cmd+backspace' : 'del',
context: NavigatorKeybindingContexts.navigatorActive
});
if (isOSX) {
registry.registerKeybinding({
command: WorkspaceCommands.FILE_DELETE.id,
keybinding: 'cmd+backspace',
context: NavigatorKeybindingContexts.navigatorActive
});
}

registry.registerKeybinding({
command: WorkspaceCommands.FILE_RENAME.id,
Expand Down
9 changes: 1 addition & 8 deletions packages/preferences/src/browser/preferences-contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,9 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
}

registerKeybindings(keybindings: KeybindingRegistry): void {
if (isOSX && !isFirefox) {
keybindings.registerKeybinding({
command: CommonCommands.OPEN_PREFERENCES.id,
keybinding: 'cmd+,'
});
}

keybindings.registerKeybinding({
command: CommonCommands.OPEN_PREFERENCES.id,
keybinding: 'ctrl+,',
keybinding: (isOSX && !isFirefox) ? 'cmd+,' : 'ctrl+,'
});
}

Expand Down