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

rename deleteMessagesFromFolder() to moveMessagesToFolderType() as it is 90% to move instead of delete

Browse source
This commit is contained in:
the-djmaze 2022-09-27 18:59:07 +02:00
parent cfbc04d3a4
commit 0200bf1674
4 changed files with 38 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,15 @@ const
* @param {Array=} aMessages = null
* @returns {void}
*/
listAction = (...args) => MessagelistUserStore.setAction(...args);
listAction = (...args) => MessagelistUserStore.setAction(...args),
moveMessagesToFolderType = (toFolderType, bDelete) =>
rl.app.moveMessagesToFolderType(
toFolderType,
FolderUserStore.currentFolderFullName(),
MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
bDelete
);
let
iGoToUpOrDownTimeout = 0,
@ -218,7 +226,7 @@ export class MailMessageList extends AbstractViewRight {
).throttle(50));
decorateKoCommands(this, {
multyForwardCommand: canBeMovedHelper,
forwardCommand: canBeMovedHelper,
deleteWithoutMoveCommand: canBeMovedHelper,
deleteCommand: canBeMovedHelper,
archiveCommand: canBeMovedHelper,
@ -246,7 +254,7 @@ export class MailMessageList extends AbstractViewRight {
}
}
multyForwardCommand() {
forwardCommand() {
showMessageComposer([
ComposeType.ForwardAsAttachment,
MessagelistUserStore.listCheckedOrSelected()
@ -255,49 +263,24 @@ export class MailMessageList extends AbstractViewRight {
deleteWithoutMoveCommand() {
if (SettingsCapa('DangerousActions')) {
rl.app.deleteMessagesFromFolder(
FolderType.Trash,
FolderUserStore.currentFolderFullName(),
MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
false
);
moveMessagesToFolderType(FolderType.Trash, true);
}
}
deleteCommand() {
rl.app.deleteMessagesFromFolder(
FolderType.Trash,
FolderUserStore.currentFolderFullName(),
MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
true
);
moveMessagesToFolderType(FolderType.Trash);
}
archiveCommand() {
rl.app.deleteMessagesFromFolder(
FolderType.Archive,
FolderUserStore.currentFolderFullName(),
MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
true
);
moveMessagesToFolderType(FolderType.Archive);
}
spamCommand() {
rl.app.deleteMessagesFromFolder(
FolderType.Spam,
FolderUserStore.currentFolderFullName(),
MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
true
);
moveMessagesToFolderType(FolderType.Spam);
}
notSpamCommand() {
rl.app.deleteMessagesFromFolder(
FolderType.NotSpam,
FolderUserStore.currentFolderFullName(),
MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
true
);
moveMessagesToFolderType(FolderType.NotSpam);
}
moveCommand() {}
@ -720,7 +703,7 @@ export class MailMessageList extends AbstractViewRight {
});
addShortcut('f,mailforward', 'shift', [Scope.MessageList, Scope.MessageView], () => {
this.multyForwardCommand();
this.forwardCommand();
return false;
});