diff --git a/dev/Common/UtilsUser.js b/dev/Common/UtilsUser.js index 16f224200..ee7922f58 100644 --- a/dev/Common/UtilsUser.js +++ b/dev/Common/UtilsUser.js @@ -248,7 +248,7 @@ setLayoutResizer = (source, sClientSideKeyName, mode) => viewMessage = (oMessage, popup) => { if (popup) { - oMessage.viewPopupMessage(); + oMessage.popupMessage(); } else { MessageUserStore.error(''); let id = 'rl-msg-' + oMessage.hash, diff --git a/dev/Model/Message.js b/dev/Model/Message.js index b26b5157f..fd6c6126c 100644 --- a/dev/Model/Message.js +++ b/dev/Model/Message.js @@ -343,7 +343,10 @@ export class MessageModel extends AbstractModel { return this.viewBody(false); } - viewPopupMessage(print) { + /** + * @param {boolean=} print = false + */ + popupMessage(print) { const timeStampInUTC = this.dateTimestamp() || 0, ccLine = this.cc.toString(), @@ -371,18 +374,11 @@ export class MessageModel extends AbstractModel { .replace('', `
${attachments}
`) ); sdoc.close(); - print && setTimeout(() => win.print(), 100); - } - - /** - * @param {boolean=} print = false - */ - popupMessage() { - this.viewPopupMessage(); + (true === print) && setTimeout(() => win.print(), 100); } printMessage() { - this.viewPopupMessage(true); + this.popupMessage(true); } /** diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 498cadfd4..dc27edbb0 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -332,7 +332,7 @@ export class MailMessageView extends AbstractViewRight { const oMessage = new MessageModel(); MimeToMessage(text, oMessage); // cleanHTML - oMessage.viewPopupMessage(); + oMessage.popupMessage(); }); } else { download(url, attachment.fileName);