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

Cleanup JavaScript MessageModel by moving dynamic code to MailMessageView and ComposePopupView

Browse source
This commit is contained in:
the-djmaze 2022-12-22 09:56:06 +01:00
parent ae1de36ee0
commit bad33e6dc4
4 changed files with 54 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -900,7 +900,7 @@ export class ComposePopupView extends AbstractViewPopup {
switch (msgComposeType) {
case ComposeType.Reply:
case ComposeType.ReplyAll:
sFrom = message.fromToLine(false, true);
sFrom = message.from.toString(false, true);
sText = '<br><br><p>' + i18n('COMPOSE/REPLY_MESSAGE_TITLE', { DATETIME: sDate, EMAIL: sFrom })
+ ':</p><blockquote>'
+ sText.trim()
@ -908,9 +908,9 @@ export class ComposePopupView extends AbstractViewPopup {
break;
case ComposeType.Forward:
sFrom = message.fromToLine(false, true);
sTo = message.toToLine(false, true);
sCc = message.ccToLine(false, true);
sFrom = message.from.toString(false, true);
sTo = message.to.toString(false, true);
sCc = message.cc.toString(false, true);
sText = '<br><br><p>' + i18n('COMPOSE/FORWARD_MESSAGE_TOP_TITLE') + '</p><div>'
+ i18n('GLOBAL/FROM') + ': ' + sFrom
+ '<br>'

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

@ -130,7 +130,7 @@ export class MailMessageView extends AbstractViewRight {
this.isDraftFolder = MessagelistUserStore.isDraftFolder;
this.isSpamFolder = MessagelistUserStore.isSpamFolder;
this.message = MessageUserStore.message;
this.message = currentMessage;
this.messageLoadingThrottle = MessageUserStore.loading;
this.messagesBodiesDom = MessageUserStore.bodiesDom;
this.messageError = MessageUserStore.error;
@ -157,6 +157,21 @@ export class MailMessageView extends AbstractViewRight {
messageVisibility: () => !MessageUserStore.loading() && !!currentMessage(),
tagsToHTML: () => currentMessage()?.flags().map(value =>
isAllowedKeyword(value)
? '<span class="focused msgflag-'+value+'">' + i18n('MESSAGE_TAGS/'+value,0,value) + '</span>'
: ''
).join(' '),
askReadReceipt: () =>
(MessagelistUserStore.isDraftFolder() || MessagelistUserStore.isSentFolder())
&& currentMessage()?.readReceipt()
&& currentMessage()?.flags().includes('$mdnsent'),
listAttachments: () => currentMessage()?.attachments()
.filter(item => SettingsUserStore.listInlineAttachments() || !item.isLinked()),
hasAttachments: () => this.listAttachments().length,
canBeRepliedOrForwarded: () => !MessagelistUserStore.isDraftFolder() && this.messageVisibility(),
viewFromDkimVisibility: () => 'none' !== this.viewFromDkimData()[0],
@ -181,6 +196,8 @@ export class MailMessageView extends AbstractViewRight {
return '';
},
firstUnsubsribeLink: () => currentMessage()?.unsubsribeLinks()[0] || '',
pgpSupported: () => currentMessage() && PgpUserStore.isSupported(),
messageListOrViewLoading:
@ -195,11 +212,11 @@ export class MailMessageView extends AbstractViewRight {
}
this.viewHash = message.hash;
// TODO: make first param a user setting #683
this.viewFromShort(message.fromToLine(false, true));
this.viewFromShort(message.from.toString(false, true));
let dkim = 1 === arrayLength(message.from) && message.dkim
&& message.dkim.find(dkim => message.from[0].email.includes(dkim[1]));
this.viewFromDkimData(dkim ? [dkim[0], dkim[2]] : ['none', '']);
this.viewToShort(message.toToLine(true, true));
this.viewToShort(message.to.toString(true, true));
} else {
MessagelistUserStore.selectedMessage(null);
@ -453,13 +470,6 @@ export class MailMessageView extends AbstractViewRight {
});
}
/**
* @returns {boolean}
*/
isDraftOrSentFolder() {
return MessagelistUserStore.isDraftFolder() || MessagelistUserStore.isSentFolder();
}
scrollMessageToTop() {
oMessageScrollerDom().scrollTop = (50 < oMessageScrollerDom().scrollTop) ? 50 : 0;
}