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

Bugfix: '`' backtick shortcut being dead key

Browse source 
* remove 'Insert' key from class Selector and bugfix Selector ' ' space.
* replace 'M' (move) shortcut with 'Insert' (like: insert into)
* '`' backtick being dead key shortcut with 'M' and 'ContextMenu' keys.
This commit is contained in:
djmaze 2020-10-09 15:00:26 +02:00
parent e0f5849de6
commit 4177467f81
8 changed files with 70 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

24
dev/View/Popup/Compose.js
View file

@ -1151,25 +1151,23 @@ class ComposePopupView extends AbstractViewNext {
}
}
popupMenu(event) {
if (event.ctrlKey || event.metaKey || 'ContextMenu' == event.key
|| (this.oEditor && !this.oEditor.hasFocus() && !inFocus())) {
this.identitiesDropdownTrigger(true);
return false;
}
return true;
}
onBuild(dom) {
this.initUploader();
shortcuts.add('q', 'meta', KeyState.Compose, ()=>false);
shortcuts.add('w', 'meta', KeyState.Compose, ()=>false);
shortcuts.add('`', '', KeyState.Compose, () => {
if (this.oEditor && !this.oEditor.hasFocus() && !inFocus()) {
this.identitiesDropdownTrigger(true);
return false;
}
return true;
});
shortcuts.add('`', 'ctrl', KeyState.Compose, () => {
this.identitiesDropdownTrigger(true);
return false;
});
shortcuts.add('m,contextmenu', '', KeyState.Compose, e => this.popupMenu(e));
shortcuts.add('m', 'ctrl', KeyState.Compose, e => this.popupMenu(e));
shortcuts.add('escape,close', '', KeyState.Compose, () => {
this.skipCommand();

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

@ -81,10 +81,11 @@ class AbstractSystemDropDownUserView extends AbstractViewNext {
}
onBuild() {
shortcuts.add('`', '', [KeyState.MessageList, KeyState.MessageView, KeyState.Settings], () => {
shortcuts.add('m,contextmenu', '', [KeyState.MessageList, KeyState.MessageView, KeyState.Settings], () => {
if (this.viewModelVisible) {
MessageStore.messageFullScreenMode(false);
this.accountMenuDropdownTrigger(true);
return false;
}
});

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

@ -801,7 +801,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
if (Settings.capa(Capa.MessageListActions)) {
// move
shortcuts.add('m', '', KeyState.MessageList, () => {
shortcuts.add('insert', '', KeyState.MessageList, () => {
if (this.newMoveToFolder()) {
this.moveNewCommand();
} else {