diff --git a/client/share/utils.js b/client/share/utils.js index a1e4d803..ed22c110 100644 --- a/client/share/utils.js +++ b/client/share/utils.js @@ -206,16 +206,23 @@ export function escapeXml(str) { export function keyEventToCode(event) { let result = []; + const modCode = event.code.substring(0, 3); if (event.metaKey) result.push('Meta'); - if (event.ctrlKey) + if (event.ctrlKey && modCode != 'Con') result.push('Ctrl'); - if (event.shiftKey) + if (event.shiftKey && modCode != 'Shi') result.push('Shift'); - if (event.altKey) + if (event.altKey && modCode != 'Alt') result.push('Alt'); - result.push(event.code); + let code = event.code; + if (modCode == 'Dig') { + code = code.substring(5, 6); + } else if (modCode == 'Key') { + code = code.substring(3, 4); + } + result.push(code); return result.join('+'); } diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js index 6e5c381c..cd9fa0a8 100644 --- a/client/store/modules/reader.js +++ b/client/store/modules/reader.js @@ -30,7 +30,7 @@ const toolButtons = [ //readerActions[name] const hotKeys = [ - {name: 'help', codes: ['F1', 'KeyH']}, + {name: 'help', codes: ['F1', 'H']}, {name: 'loader', codes: ['Escape']}, ];