mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-24 10:27:10 +02:00
This commit is contained in:
parent
12a26023dd
commit
c691fedc12
@ -6,7 +6,7 @@ describe('normalizeAccelerator', () => {
|
||||
['Z', { v6: 'z', v5: 'Z' }],
|
||||
['Alt+A', { v6: 'Alt-a', v5: 'Alt-A' }],
|
||||
['Shift+A', { v6: 'Shift-a', v5: 'Shift-A' }],
|
||||
['Shift+Up', { v6: 'Shift-Up', v5: 'Shift-Up' }],
|
||||
['Shift+Up', { v6: 'Shift-ArrowUp', v5: 'Shift-Up' }],
|
||||
])(
|
||||
'should convert single-letter key names to lowercase for CM6, keep case unchanged for CM5 (%j)',
|
||||
(original, expected) => {
|
||||
|
@ -12,11 +12,17 @@ const normalizeAccelerator = (accelerator: string, editorVersion: CodeMirrorVers
|
||||
const parts = command.split(/-(?!$)/);
|
||||
let name = parts[parts.length - 1];
|
||||
|
||||
// In CodeMirror 6, an uppercase single-letter key name makes the editor
|
||||
// require the shift key to activate the shortcut. If a key name like `Up`,
|
||||
// however, `.toLowerCase` breaks the shortcut.
|
||||
if (editorVersion === CodeMirrorVersion.CodeMirror6 && name.length === 1) {
|
||||
name = name.toLowerCase();
|
||||
if (editorVersion === CodeMirrorVersion.CodeMirror6) {
|
||||
// In CodeMirror 6, an uppercase single-letter key name makes the editor
|
||||
// require the shift key to activate the shortcut. If a key name like `Up`,
|
||||
// however, `.toLowerCase` breaks the shortcut.
|
||||
if (name.length === 1) {
|
||||
name = name.toLowerCase();
|
||||
}
|
||||
|
||||
if (['Up', 'Down', 'Left', 'Right'].includes(name)) {
|
||||
name = `Arrow${name}`;
|
||||
}
|
||||
}
|
||||
|
||||
let alt, ctrl, shift, cmd;
|
||||
|
Loading…
Reference in New Issue
Block a user