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

Remove unused properties and improved message view header

Browse source
This commit is contained in:
djmaze 2021-04-07 16:35:46 +02:00
parent 8620df907e
commit 89cbcf6f63
6 changed files with 59 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

26
dev/Model/Message.js
View file

@ -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.<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,

19
dev/Styles/MessageView.less
View file

@ -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;
}
}

1
dev/View/User/MailBox/FolderList.js
View file

@ -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;

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

@ -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, '');
}

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

@ -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());