the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 15:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge viewPopupMessage() into popupMessage()

Browse source
This commit is contained in:
the-djmaze 2023-12-01 23:00:39 +01:00
parent 004de4e48c
commit 7e30c50dfe
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/Common/UtilsUser.js
View file

@ -248,7 +248,7 @@ setLayoutResizer = (source, sClientSideKeyName, mode) =>
viewMessage = (oMessage, popup) => { viewMessage = (oMessage, popup) => {
if (popup) { if (popup) {
oMessage.viewPopupMessage(); oMessage.popupMessage();
} else { } else {
MessageUserStore.error(''); MessageUserStore.error('');
let id = 'rl-msg-' + oMessage.hash, let id = 'rl-msg-' + oMessage.hash,

16
dev/Model/Message.js
View file

@ -343,7 +343,10 @@ export class MessageModel extends AbstractModel {
return this.viewBody(false); return this.viewBody(false);
} }
viewPopupMessage(print) { /**
* @param {boolean=} print = false
*/
popupMessage(print) {
const const
timeStampInUTC = this.dateTimestamp() || 0, timeStampInUTC = this.dateTimestamp() || 0,
ccLine = this.cc.toString(), ccLine = this.cc.toString(),
@ -371,18 +374,11 @@ export class MessageModel extends AbstractModel {
.replace('</body>', `<div id="attachments">${attachments}</div></body>`) .replace('</body>', `<div id="attachments">${attachments}</div></body>`)
); );
sdoc.close(); sdoc.close();
print && setTimeout(() => win.print(), 100); (true === print) && setTimeout(() => win.print(), 100);
}
/**
* @param {boolean=} print = false
*/
popupMessage() {
this.viewPopupMessage();
} }
printMessage() { printMessage() {
this.viewPopupMessage(true); this.popupMessage(true);
} }
/** /**

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

@ -332,7 +332,7 @@ export class MailMessageView extends AbstractViewRight {
const oMessage = new MessageModel(); const oMessage = new MessageModel();
MimeToMessage(text, oMessage); MimeToMessage(text, oMessage);
// cleanHTML // cleanHTML
oMessage.viewPopupMessage(); oMessage.popupMessage();
}); });
} else { } else {
download(url, attachment.fileName); download(url, attachment.fileName);