the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-09-28 07:54:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

Remove messageVisibilityCommand

Browse source
This commit is contained in:
djmaze 2021-03-12 17:08:58 +01:00
parent 227db0e0c3
commit 9c14ba1b9d
3 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,8 +179,6 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
messageListFocused: () => Focused.MessageList === AppUserStore.focusedState()
});
// this.messageListChecked = MessageUserStore.listChecked;
this.hasCheckedOrSelectedLines = MessageUserStore.hasCheckedOrSelected,
this.quotaTooltip = this.quotaTooltip.bind(this);

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

@ -45,20 +45,21 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
constructor() {
super('User/MailBox/MessageView', 'MailMessageView');
const createCommandReplyHelper = type =>
createCommand(() => {
this.lastReplyAction(type);
this.replyOrforward(type);
}, this.canBeRepliedOrForwarded),
const
createCommandReplyHelper = type =>
createCommand(() => {
this.lastReplyAction(type);
this.replyOrforward(type);
}, this.canBeRepliedOrForwarded),
createCommandActionHelper = (folderType, useFolder) =>
createCommand(() => {
const message = this.message();
if (message && this.allowMessageListActions) {
this.message(null);
rl.app.deleteMessagesFromFolder(folderType, message.folder, [message.uid], useFolder);
}
}, this.messageVisibility);
createCommandActionHelper = (folderType, useFolder) =>
createCommand(() => {
const message = this.message();
if (message && this.allowMessageListActions) {
this.message(null);
rl.app.deleteMessagesFromFolder(folderType, message.folder, [message.uid], useFolder);
}
}, this.messageVisibility);
this.oHeaderDom = null;
this.oMessageScrollerDom = null;
@ -82,7 +83,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
this.attachmentsActions = AppUserStore.attachmentsActions;
this.message = MessageUserStore.message;
// this.messageListChecked = MessageUserStore.listChecked;
this.hasCheckedMessages = MessageUserStore.hasCheckedMessages;
this.messageListCheckedOrSelectedUidsWithSubMails = MessageUserStore.listCheckedOrSelectedUidsWithSubMails;
this.messageLoadingThrottle = MessageUserStore.messageLoading;
@ -266,7 +266,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
decorateKoCommands(this, {
closeMessageCommand: 1,
messageVisibilityCommand: self => self.messageVisibility(),
messageEditCommand: self => self.messageVisibility(),
goUpCommand: self => !self.messageListAndMessageViewLoading(),
goDownCommand: self => !self.messageListAndMessageViewLoading()
@ -277,8 +276,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
MessageUserStore.message(null);
}
messageVisibilityCommand() {}
messageEditCommand() {
this.editMessage();
}
@ -417,7 +414,7 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
el = eqs(event, '.attachmentsPlace .showPreplay');
if (el) {
event.stopPropagation();
const attachment = ko.dataFor(el); // eslint-disable-line no-invalid-this
const attachment = ko.dataFor(el);
if (attachment && SMAudio.supported) {
switch (true) {
case SMAudio.supportedMp3 && attachment.isMp3():
@ -441,7 +438,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
}
if (eqs(event, '.messageItemHeader .subjectParent .flagParent')) {
// eslint-disable-line prefer-arrow-callback
const message = this.message();
message && rl.app.messageListAction(
message.folder,
@ -452,8 +448,7 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
el = eqs(event, '.thread-list .flagParent');
if (el) {
// eslint-disable-line prefer-arrow-callback
const message = ko.dataFor(el); // eslint-disable-line no-invalid-this
const message = ko.dataFor(el);
message && message.folder && message.uid && rl.app.messageListAction(
message.folder,
message.isFlagged() ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag,
@ -723,7 +718,7 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
*/
printableCheckedMessageCount() {
const cnt = this.messageListCheckedOrSelectedUidsWithSubMails().length;
return 0 < cnt ? (100 > cnt ? cnt : '99+') : ''; // eslint-disable-line no-magic-numbers
return 0 < cnt ? (100 > cnt ? cnt : '99+') : '';
}
/**

4
snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -52,9 +52,9 @@
<a class="btn btn-thin-2 btn-transparent buttonForward fontastic"
data-bind="visible: 'forward' === lastReplyAction() && allowComposer, command: forwardCommand, tooltip: 'MESSAGE/BUTTON_FORWARD'">→</a>
<div class="btn-group" data-bind="registerBootstrapDropdown: true, visible: allowComposer || allowMessageListActions || allowMessageActions" style="display: inline-block">
<a class="btn btn-thin-2 btn-transparent dropdown-toggle" id="more-view-dropdown-id" href="#" tabindex="-1" data-toggle="dropdown" style="margin-left: -4px; margin-right: 2px" data-bind="command: messageVisibilityCommand">
<a class="btn btn-thin-2 btn-transparent dropdown-toggle" id="more-view-dropdown-id" href="#" tabindex="-1" data-toggle="dropdown" style="margin-left: -4px; margin-right: 2px">
<span data-bind="visible: allowComposer">▾</span>
<span data-bind="visible: !allowComposer" class="fontastic">⋮</span>
<span data-bind="visible: allowComposer" class="caret"></span>
</a>
<ul class="dropdown-menu g-ui-menu right-edge" role="menu" aria-labelledby="more-view-dropdown-id">
<div data-bind="visible: allowComposer && !isDraftFolder()">