fixed multiple shortcuts handling #898

This commit is contained in:
Jan Prochazka
2024-09-25 09:10:54 +02:00
parent b63479bf45
commit 0c2579897f
2 changed files with 12 additions and 10 deletions

View File

@@ -62,21 +62,21 @@ export function isMac() {
export function formatKeyText(keyText: string): string {
if (isMac()) {
return keyText
.replace('CtrlOrCommand+', '⌘ ')
.replace('Shift+', '⇧ ')
.replace('Alt+', '⌥ ')
.replace('Command+', '⌘ ')
.replace('Ctrl+', '⌃ ')
.replace('Backspace', '⌫ ');
.replace(/CtrlOrCommand\+/g, '⌘ ')
.replace(/Shift\+/g, '⇧ ')
.replace(/Alt\+g/, '⌥ ')
.replace(/Command\+/g, '⌘ ')
.replace(/Ctrl\+/g, '⌃ ')
.replace(/Backspace/g, '⌫ ');
}
return keyText.replace('CtrlOrCommand+', 'Ctrl+');
return keyText.replace(/CtrlOrCommand\+/g, 'Ctrl+');
}
export function resolveKeyText(keyText: string): string {
if (isMac()) {
return keyText.replace('CtrlOrCommand+', 'Command+');
return keyText.replace(/CtrlOrCommand\+/g, 'Command+');
}
return keyText.replace('CtrlOrCommand+', 'Ctrl+');
return keyText.replace(/CtrlOrCommand\+/g, 'Ctrl+');
}
export function isCtrlOrCommandKey(event) {