Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 12:39:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve https://github.com/the-djmaze/snappymail/issues/22

Browse source
This commit is contained in:
djmaze 2020-10-09 10:31:44 +02:00
parent ac535b1d03
commit ee23a5553e
9 changed files with 46 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/shortcuts.js
View file

@ -33,10 +33,10 @@ const
keydown = event => {
const key = (event.key||event.code||'').toLowerCase();
if (scope[key] && win.shortcuts.filter(event)) {
if (scope[key] && win.shortcuts.filter(event.target)) {
fire(scope[key], event);
}
if (!event.defaultPrevented && _scope !== 'all' && _scopes.all[key] && win.shortcuts.filter(event)) {
if (!event.defaultPrevented && _scope !== 'all' && _scopes.all[key] && win.shortcuts.filter(event.target)) {
fire(_scopes.all[key], event);
}
};
@ -45,8 +45,6 @@ let
scope = {},
_scope = 'all';
doc.addEventListener('keydown', keydown);
win.shortcuts = {
on: () => doc.addEventListener('keydown', keydown),
off: () => doc.removeEventListener('keydown', keydown),
@ -81,8 +79,7 @@ win.shortcuts = {
getScope: () => _scope,
getMetaKey: () => meta,
// ignore keydown in any element that supports keyboard input
filter: event => !(event.target.matches
&& (event.target.matches('input,select,textarea') || event.target.closest('[contenteditable]')))
filter: node => !(!node.closest || node.closest('input,select,textarea,[contenteditable]'))
};
win.shortcuts.on();