mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-25 02:44:03 +02:00
Code Releases Activity

Improve usability

Browse Source
This commit is contained in:
syuilo
2018-09-18 09:11:52 +09:00
parent 19c72627fc
commit 55e2ae1408
4 changed files with 75 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/app/common/hotkey.ts
View File

@@ -13,8 +13,10 @@ const getKeyMap = keymap => Object.keys(keymap).map(input => {
case 'meta':
result[keyName] = true;
break;
default:
default: {
result.keyCode = keyCode(keyName);
if (!Array.isArray(result.keyCode)) result.keyCode = [result.keyCode];
}
}
});
@@ -45,7 +47,7 @@ export default {
for (const hotkey of el._keymap) {
if (el._hotkey_global && reservedKeyCodes.includes(`'${e.keyCode}'`)) break;
const callback = hotkey.keyCode === e.keyCode &&
const callback = hotkey.keyCode.includes(e.keyCode) &&
!!hotkey.ctrl === e.ctrlKey &&
!!hotkey.alt === e.altKey &&
!!hotkey.shift === e.shiftKey &&