Работа над хоткеями

This commit is contained in:
Book Pauk
2020-03-15 21:44:26 +07:00
parent dc3f682d2d
commit 0c5f5975aa
2 changed files with 12 additions and 5 deletions

View File

@@ -206,16 +206,23 @@ export function escapeXml(str) {
export function keyEventToCode(event) { export function keyEventToCode(event) {
let result = []; let result = [];
const modCode = event.code.substring(0, 3);
if (event.metaKey) if (event.metaKey)
result.push('Meta'); result.push('Meta');
if (event.ctrlKey) if (event.ctrlKey && modCode != 'Con')
result.push('Ctrl'); result.push('Ctrl');
if (event.shiftKey) if (event.shiftKey && modCode != 'Shi')
result.push('Shift'); result.push('Shift');
if (event.altKey) if (event.altKey && modCode != 'Alt')
result.push('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('+'); return result.join('+');
} }

View File

@@ -30,7 +30,7 @@ const toolButtons = [
//readerActions[name] //readerActions[name]
const hotKeys = [ const hotKeys = [
{name: 'help', codes: ['F1', 'KeyH']}, {name: 'help', codes: ['F1', 'H']},
{name: 'loader', codes: ['Escape']}, {name: 'loader', codes: ['Escape']},
]; ];