From 6a903bc9b2e20d4c16d5e7ae6bb01c8df1290303 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Tue, 10 Aug 2021 12:22:55 +0200
Subject: [PATCH] Reduce MessageList html/css footprint

---
 dev/Styles/User/MessageList.less              |  9 ++-------
 dev/View/User/MailBox/MessageList.js          | 19 ++++++++++++++-----
 .../templates/Views/User/MailMessageList.html |  9 +++------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index f7a95f608..32c929a37 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -142,20 +142,15 @@ html.rl-no-preview-pane {
 			line-height: 13px;
 		}
 
-		.listEmptyList, .listEmptyListLoading, .listDragOver, .listError, .listEmptySearchList {
+		.listEmptyMessage, .listLoading, .listDragOver, .listError {
 			color: #999;
 			text-align: center;
 			padding: 60px 10px;
 			font-size: 24px;
 			line-height: 30px;
-
-			.e-icon {
-				font-size: 24px;
-				line-height: 30px;
-			}
 		}
 
-		.listEmptyListLoading .icon-spinner {
+		.listLoading .icon-spinner {
 			width: 0.75em;
 			height: 0.75em;
 			margin: 0;
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 5475c79f2..1dc071017 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -84,7 +84,6 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
 
 		this.messageListEndThreadUid = MessageUserStore.listEndThreadUid;
 
-		this.messageListCheckedOrSelected = MessageUserStore.listCheckedOrSelected;
 		this.messageListCompleteLoadingThrottle = MessageUserStore.listCompleteLoading;
 
 		initOnStartOrLangChange(() => this.emptySubjectValue = i18n('MESSAGE_LIST/EMPTY_SUBJECT_TEXT'));
@@ -549,7 +548,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
 		this.setActionForAll(
 			FolderUserStore.currentFolderFullNameRaw(),
 			MessageSetAction.SetSeen,
-			this.messageListEndThreadUid()
+			MessageUserStore.listEndThreadUid()
 		);
 	}
 
@@ -658,11 +657,21 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
 		}
 	}
 
+	listEmptyMessage() {
+		if (!this.dragOver()
+		 && !MessageUserStore.list().length
+		 && !MessageUserStore.listCompleteLoading()
+		 && !MessageUserStore.listError()) {
+			 return i18n('MESSAGE_LIST/EMPTY_' + (MessageUserStore.listSearch() ? 'SEARCH_' : '') + 'LIST');
+		}
+		return '';
+	}
+
 	clearListIsVisible() {
 		return (
 			!this.messageListSearchDesc() &&
-			!this.messageListError() &&
-			!this.messageListEndThreadUid() &&
+			!MessageUserStore.listError() &&
+			!MessageUserStore.listEndThreadUid() &&
 			MessageUserStore.list().length &&
 			(this.isSpamFolder() || this.isTrashFolder())
 		);
@@ -820,7 +829,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
 			if (this.messageListSearchDesc()) {
 				this.cancelSearch();
 				return false;
-			} else if (this.messageListEndThreadUid()) {
+			} else if (MessageUserStore.listEndThreadUid()) {
 				this.cancelThreadUid();
 				return false;
 			}
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index 874a88fb0..d36c56dff 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -175,22 +175,19 @@
 			</div>
 			<div class="listSearchDesc" data-bind="visible: '' !== messageListSearchDesc(), text: messageListSearchDesc"></div>
 			<div class="listDragOver" data-bind="css: {'viewAppendArea': dragOver() && '' === messageListError() && !popupVisibility(), 'dragOverEnter': dragOverEnter }, initDom: dragOverArea">
-				<i class="fontastic e-icon">⬇</i>
+				<i class="fontastic">⬇</i>
 				<span data-i18n="MESSAGE_LIST/PUT_MESSAGE_HERE"></span>
 			</div>
 			<div class="listClear" data-bind="visible: clearListIsVisible()">
 				<a href="#" class="g-ui-link" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER" data-bind="command: clearCommand"></a>
 			</div>
 			<div class="listError error" data-bind="visible: !dragOver() && '' !== messageListError(), text: messageListError"></div>
-			<div class="listEmptyList" data-bind="visible: !dragOver() && 0 === messageList().length && !messageListCompleteLoadingThrottle() && '' === messageListError() && '' === messageListSearch()"
-				data-i18n="MESSAGE_LIST/EMPTY_LIST"></div>
-			<div class="listEmptyListLoading" data-bind="visible: !dragOver() && 0 === messageList().length &&
+			<div class="listEmptyMessage" data-bind="visible: listEmptyMessage(), text: listEmptyMessage()"></div>
+			<div class="listLoading" data-bind="visible: !dragOver() && 0 === messageList().length &&
 				messageListCompleteLoadingThrottle() && '' === messageListError()">
 				<i class="icon-spinner"></i>
 				<span data-i18n="GLOBAL/LOADING"></span>
 			</div>
-			<div class="listEmptySearchList" data-bind="visible: !dragOver() && 0 === messageList().length && !messageListCompleteLoadingThrottle() && '' === messageListError() && '' !== messageListSearch()"
-				data-i18n="MESSAGE_LIST/EMPTY_SEARCH_LIST"></div>
 			<div data-bind="dragmessages: getDragData">
 				<div class="messageListPlace" data-bind="foreach: messageList">