Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-27 19:19:21 +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

2
dev/View/User/AbstractSystemDropDown.js
View file

@ -89,7 +89,7 @@ class AbstractSystemDropDownUserView extends AbstractViewNext {
});
// shortcuts help
shortcuts.add('/', 'shift', [KeyState.MessageList, KeyState.MessageView, KeyState.Settings], () => {
shortcuts.add('?,f1,help', '', [KeyState.MessageList, KeyState.MessageView, KeyState.Settings], () => {
if (this.viewModelVisible) {
showScreenPopup(require('View/Popup/KeyboardShortcutsHelp'));
return false;

2
dev/View/User/MailBox/FolderList.js
View file

@ -145,7 +145,7 @@ class FolderListMailBoxUserView extends AbstractViewNext {
return false;
});
shortcuts.add('enter', '', KeyState.FolderList, () => {
shortcuts.add('enter,open', '', KeyState.FolderList, () => {
const item = qs('.b-folders .e-item .e-link:not(.hidden).focused');
if (item) {
AppStore.focusedState(Focused.MessageList);

6
dev/View/User/MailBox/MessageList.js
View file

@ -728,7 +728,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
}
initShortcuts() {
shortcuts.add('enter', '', KeyState.MessageList, () => {
shortcuts.add('enter,open', '', KeyState.MessageList, () => {
if (this.message() && this.useAutoSelect()) {
dispatchEvent(new CustomEvent('mailbox.message-view.toggle-full-screen'));
return false;
@ -772,7 +772,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
if (Settings.capa(Capa.Composer)) {
// write/compose (open compose popup)
shortcuts.add('w,c', '', [KeyState.MessageList, KeyState.MessageView], () => {
shortcuts.add('w,c,new', '', [KeyState.MessageList, KeyState.MessageView], () => {
showScreenPopup(require('View/Popup/Compose'));
return false;
});
@ -827,7 +827,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
}
if (Settings.capa(Capa.Composer)) {
shortcuts.add('f', 'shift', [KeyState.MessageList, KeyState.MessageView], () => {
shortcuts.add('f,mailforward', 'shift', [KeyState.MessageList, KeyState.MessageView], () => {
this.multyForwardCommand();
return false;
});

20
dev/View/User/MailBox/MessageView.js
View file

@ -535,13 +535,13 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
shortcuts.add('escape,backspace', '', KeyState.MessageView, this.escShortcuts.bind(this));
// fullscreen
shortcuts.add('enter', '', KeyState.MessageView, () => {
shortcuts.add('enter,open', '', KeyState.MessageView, () => {
this.toggleFullScreen();
return false;
});
// reply
shortcuts.add('r', '', [KeyState.MessageList, KeyState.MessageView], () => {
shortcuts.add('r,mailreply', '', [KeyState.MessageList, KeyState.MessageView], () => {
if (MessageStore.message()) {
this.replyCommand();
return false;
@ -555,12 +555,18 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
this.replyAllCommand();
return false;
}
return true;
});
shortcuts.add('mailreply', 'shift', [KeyState.MessageList, KeyState.MessageView], () => {
if (MessageStore.message()) {
this.replyAllCommand();
return false;
}
return true;
});
// forward
shortcuts.add('f', '', [KeyState.MessageList, KeyState.MessageView], () => {
shortcuts.add('f,mailforward', '', [KeyState.MessageList, KeyState.MessageView], () => {
if (MessageStore.message()) {
this.forwardCommand();
return false;
@ -598,10 +604,8 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
});
// print
shortcuts.add('p', 'meta', [KeyState.MessageView, KeyState.MessageList], () => {
if (this.message()) {
this.message().printMessage();
}
shortcuts.add('p,printscreen', 'meta', [KeyState.MessageView, KeyState.MessageList], () => {
this.message() && this.message().printMessage();
return false;
});