serv/mox
1
1
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-03-20 00:52:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

webmail: while attachment viewer is open, don't handle global keyboard shortcuts (like search, going to inbox)

Browse source 
feedback from jonathan, thanks!
This commit is contained in:
Mechiel Lukkien 2023-08-10 11:02:13 +02:00
parent c24bb063e5
commit 0434e49c3a
No known key found for this signature in database
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
webmail/webmail.js
View file

@ -3029,10 +3029,6 @@ const newMsglistView = (msgElem, listMailboxes, setLocationHash, otherMailbox, p
updateState(oldstate); updateState(oldstate);
}, },
key: async (k, e) => { key: async (k, e) => {
if (attachmentView) {
attachmentView.key(k, e);
return;
}
const moveKeys = [ const moveKeys = [
' ', 'ArrowUp', 'ArrowDown', ' ', 'ArrowUp', 'ArrowDown',
'PageUp', 'h', 'H', 'PageUp', 'h', 'H',
@ -4228,6 +4224,10 @@ const init = async () => {
} }
l.push(e.key); l.push(e.key);
const k = l.join(' '); const k = l.join(' ');
if (attachmentView) {
attachmentView.key(k, e);
return;
}
if (composeView) { if (composeView) {
await composeView.key(k, e); await composeView.key(k, e);
return; return;

9
webmail/webmail.ts
View file

@ -2743,11 +2743,6 @@ const newMsglistView = (msgElem: HTMLElement, listMailboxes: listMailboxes, setL
}, },
key: async (k: string, e: KeyboardEvent) => { key: async (k: string, e: KeyboardEvent) => {
if (attachmentView) {
attachmentView.key(k, e)
return
}
const moveKeys = [ const moveKeys = [
' ', 'ArrowUp', 'ArrowDown', ' ', 'ArrowUp', 'ArrowDown',
'PageUp', 'h', 'H', 'PageUp', 'h', 'H',
@ -4469,6 +4464,10 @@ const init = async () => {
l.push(e.key) l.push(e.key)
const k = l.join(' ') const k = l.join(' ')
if (attachmentView) {
attachmentView.key(k, e)
return
}
if (composeView) { if (composeView) {
await composeView.key(k, e) await composeView.key(k, e)
return return