diff --git a/dev/Model/Message.js b/dev/Model/Message.js index 9c0264258..711e16ccb 100644 --- a/dev/Model/Message.js +++ b/dev/Model/Message.js @@ -211,10 +211,10 @@ export class MessageModel extends AbstractModel { /** * @param {boolean} friendlyView - * @param {boolean=} wrapWithLink = false + * @param {boolean=} wrapWithLink * @returns {string} */ - fromToLine(friendlyView, wrapWithLink = false) { + fromToLine(friendlyView, wrapWithLink) { return this.from.toString(friendlyView, wrapWithLink); } @@ -232,37 +232,37 @@ export class MessageModel extends AbstractModel { /** * @param {boolean} friendlyView - * @param {boolean=} wrapWithLink = false + * @param {boolean=} wrapWithLink * @returns {string} */ - toToLine(friendlyView, wrapWithLink = false) { + toToLine(friendlyView, wrapWithLink) { return this.to.toString(friendlyView, wrapWithLink); } /** * @param {boolean} friendlyView - * @param {boolean=} wrapWithLink = false + * @param {boolean=} wrapWithLink * @returns {string} */ - ccToLine(friendlyView, wrapWithLink = false) { + ccToLine(friendlyView, wrapWithLink) { return this.cc.toString(friendlyView, wrapWithLink); } /** * @param {boolean} friendlyView - * @param {boolean=} wrapWithLink = false + * @param {boolean=} wrapWithLink * @returns {string} */ - bccToLine(friendlyView, wrapWithLink = false) { + bccToLine(friendlyView, wrapWithLink) { return this.bcc.toString(friendlyView, wrapWithLink); } /** * @param {boolean} friendlyView - * @param {boolean=} wrapWithLink = false + * @param {boolean=} wrapWithLink * @returns {string} */ - replyToToLine(friendlyView, wrapWithLink = false) { + replyToToLine(friendlyView, wrapWithLink) { return this.replyTo.toString(friendlyView, wrapWithLink); } @@ -318,7 +318,7 @@ export class MessageModel extends AbstractModel { * @param {boolean=} last = false * @returns {Array} */ - replyEmails(excludeEmails, last = false) { + replyEmails(excludeEmails, last) { const result = [], unic = undefined === excludeEmails ? {} : excludeEmails; @@ -339,7 +339,7 @@ export class MessageModel extends AbstractModel { * @param {boolean=} last = false * @returns {Array.} */ - replyAllEmails(excludeEmails, last = false) { + replyAllEmails(excludeEmails, last) { let data = []; const toResult = [], ccResult = [], @@ -364,7 +364,7 @@ export class MessageModel extends AbstractModel { /** * @param {boolean=} print = false */ - viewPopupMessage(print = false) { + viewPopupMessage(print) { const timeStampInUTC = this.dateTimeStampInUTC() || 0, ccLine = this.ccToLine(false), m = 0 < timeStampInUTC ? new Date(timeStampInUTC * 1000) : null, diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less index 9242cf769..b3b84150d 100644 --- a/dev/Styles/MessageView.less +++ b/dev/Styles/MessageView.less @@ -136,15 +136,8 @@ } .informationFull { - margin-top: 10px; - border: 1px solid #999; - border-radius: 5px; - padding: 8px 0; - overflow: hidden; + margin-top: 30px; - .size { - margin-left: 4px; - } table { width: 100%; @@ -155,7 +148,7 @@ } td { - padding: 0 10px; + padding: 4px; vertical-align: top; min-width: 43px; } @@ -163,17 +156,15 @@ td:first-child { border-right: 1px solid #999; text-align: right; + white-space: nowrap; width: 1%; } - .uiLine { - } - - .uiLabel { + .labelTo { white-space: nowrap; } - .uiLabelValue { + td + td { word-break: break-all; } } diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js index 4acbe3cfb..63f286d3b 100644 --- a/dev/View/User/MailBox/FolderList.js +++ b/dev/View/User/MailBox/FolderList.js @@ -26,7 +26,6 @@ export class FolderListMailBoxUserView extends AbstractViewLeft { this.composeInEdit = AppUserStore.composeInEdit; - this.messageList = MessageUserStore.list; this.folderList = FolderUserStore.folderList; this.folderListSystem = FolderUserStore.folderListSystem; this.foldersChanging = FolderUserStore.foldersChanging; diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index a35d1a104..27459d8bb 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -52,7 +52,6 @@ export class MessageListMailBoxUserView extends AbstractViewRight { constructor() { super('User/MailBox/MessageList', 'MailMessageList'); - this.sLastUid = null; this.bPrefetch = false; this.emptySubjectValue = ''; @@ -69,10 +68,8 @@ export class MessageListMailBoxUserView extends AbstractViewRight { this.popupVisibility = ko.computed(() => 0 < popupVisibilityNames().length); - this.message = MessageUserStore.message; this.messageList = MessageUserStore.list; - this.folderList = FolderUserStore.folderList; this.sortSupported = FolderUserStore.sortSupported; this.composeInEdit = AppUserStore.composeInEdit; @@ -93,8 +90,6 @@ export class MessageListMailBoxUserView extends AbstractViewRight { initOnStartOrLangChange(() => this.emptySubjectValue = i18n('MESSAGE_LIST/EMPTY_SUBJECT_TEXT')); - this.userQuota = QuotaUserStore.quota; - this.userUsageSize = QuotaUserStore.usage; this.userUsageProc = QuotaUserStore.percentage; this.addObservables({ @@ -386,7 +381,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight { return false; }); - if (!SettingsUserStore.usePreviewPane() && !this.message()) { + if (!SettingsUserStore.usePreviewPane() && !MessageUserStore.message()) { this.selector.iFocusedNextHelper = up ? -1 : 1; } else { this.selector.iSelectNextHelper = up ? -1 : 1; @@ -582,7 +577,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight { } flagMessages(currentMessage) { - const checked = this.messageListCheckedOrSelected(); + const checked = MessageUserStore.listCheckedOrSelected(); if (currentMessage) { const checkedUids = checked.map(message => message.uid); if (checkedUids.includes(currentMessage.uid)) { @@ -602,7 +597,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight { } flagMessagesFast(bFlag) { - const checked = this.messageListCheckedOrSelected(); + const checked = MessageUserStore.listCheckedOrSelected(); if (checked.length) { if (undefined === bFlag) { const flagged = checked.filter(message => message.isFlagged()); @@ -622,7 +617,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight { } seenMessagesFast(seen) { - const checked = this.messageListCheckedOrSelected(); + const checked = MessageUserStore.listCheckedOrSelected(); if (checked.length) { if (undefined === seen) { const unseen = checked.filter(message => message.isUnseen()); @@ -711,7 +706,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight { initShortcuts() { shortcuts.add('enter,open', '', Scope.MessageList, () => { - if (this.message() && this.useAutoSelect()) { + if (MessageUserStore.message() && this.useAutoSelect()) { dispatchEvent(new CustomEvent('mailbox.message-view.toggle-full-screen')); return false; } @@ -842,7 +837,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight { return false; }); shortcuts.add('tab,arrowright', '', Scope.MessageList, () => { - this.message() && AppUserStore.focusedState(Scope.MessageView); + MessageUserStore.message() && AppUserStore.focusedState(Scope.MessageView); return false; }); @@ -882,9 +877,9 @@ export class MessageListMailBoxUserView extends AbstractViewRight { quotaTooltip() { return i18n('MESSAGE_LIST/QUOTA_SIZE', { - SIZE: FileInfo.friendlySize(this.userUsageSize()), - PROC: this.userUsageProc(), - LIMIT: FileInfo.friendlySize(this.userQuota()) + SIZE: FileInfo.friendlySize(QuotaUserStore.usage()), + PROC: QuotaUserStore.percentage(), + LIMIT: FileInfo.friendlySize(QuotaUserStore.quota()) }).replace(/<[^>]+>/g, ''); } diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index ee1c6b610..c9e0387d4 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -217,11 +217,11 @@ class MessageViewMailBoxUserView extends AbstractViewRight { this.viewFromShort(message.fromToLine(true, true)); this.viewFromDkimData(message.fromDkimData()); this.viewToShort(message.toToLine(true, true)); - this.viewFrom(message.fromToLine(false)); - this.viewTo(message.toToLine(false)); - this.viewCc(message.ccToLine(false)); - this.viewBcc(message.bccToLine(false)); - this.viewReplyTo(message.replyToToLine(false)); + this.viewFrom(message.fromToLine()); + this.viewTo(message.toToLine()); + this.viewCc(message.ccToLine()); + this.viewBcc(message.bccToLine()); + this.viewReplyTo(message.replyToToLine()); this.viewTimeStamp(message.dateTimeStampInUTC()); this.viewSize(message.friendlySize()); this.viewLineAsCss(message.lineAsCss()); diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html index 7567056f4..3f804153e 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html @@ -173,65 +173,68 @@
-
+
  +
()
- - :  - + :  +
- - :  - + :  +
- - + - - + + - - + + - - + + - - + + - + + + + +
- - + + +   + +
- +   - () + ()