Merge pull request #1248 from SergeyMosin/some-fixes

Some fixes

dev/Common/Selector.js

@@ -200,8 +200,16 @@ export class Selector {
 
 			addEventsListeners(contentScrollable, {
 				click: event => {
-					let el = event.target.closestWithin(this.sItemSelector, contentScrollable);
+
-					el && this.actionClick(ko.dataFor(el), event);
+					const lowerClassName = event.target.className.toLowerCase();
+					if (this.sItemSelector !== '.messageListItem'
+						|| (lowerClassName.indexOf('flagparent') === -1
+							&& lowerClassName.indexOf('checkbox') === -1)) {
+
+						let el = event.target.closestWithin(this.sItemSelector, contentScrollable);
+						el && this.actionClick(ko.dataFor(el), event);
+
+					}
 
 					const item = getItem(this.sItemCheckedSelector);
 					if (item) {

dev/Model/Message.js

@@ -128,6 +128,11 @@ export class MessageModel extends AbstractModel {
 			threadsLen: () => rl.app.messageList.threadUid() ? 0 : this.threads().length,
 			threadUnseenLen: () => rl.app.messageList.threadUid() ? 0 : this.threadUnseen().length,
 
+			threadsLenText: () => {
+				const unseenLen = this.threadUnseenLen();
+				return this.threadsLen() + (unseenLen > 0 ? '/' + unseenLen : '');
+			},
+
 			isUnseen: () => !this.flags().includes('\\seen'),
 			isFlagged: () => this.flags().includes('\\flagged'),
 //			isJunk: () => this.flags().includes('$junk') && !this.flags().includes('$nonjunk'),

dev/Stores/User/Messagelist.js

@@ -344,13 +344,23 @@ MessagelistUserStore.setAction = (sFolderFullName, iSetAction, messages) => {
 		length;
 
 	if (iSetAction == MessageSetAction.SetSeen) {
-		messages.forEach(oMessage =>
+		messages.forEach(oMessage => {
-			oMessage.isUnseen() && rootUids.push(oMessage.uid) && oMessage.flags.push('\\seen')
+			if (oMessage.isUnseen() && rootUids.push(oMessage.uid)) {
-		);
+				oMessage.flags.push('\\seen');
+				if (oMessage.threads().length > 0 && oMessage.threadUnseen().includes(oMessage.uid)) {
+					oMessage.threadUnseen.remove(oMessage.uid);
+				}
+			}
+		});
 	} else if (iSetAction == MessageSetAction.UnsetSeen) {
-		messages.forEach(oMessage =>
+		messages.forEach(oMessage => {
-			!oMessage.isUnseen() && rootUids.push(oMessage.uid) && oMessage.flags.remove('\\seen')
+			if (!oMessage.isUnseen() && rootUids.push(oMessage.uid)) {
-		);
+				oMessage.flags.remove('\\seen');
+				if (oMessage.threads().length > 0 && !oMessage.threadUnseen().includes(oMessage.uid)) {
+					oMessage.threadUnseen.push(oMessage.uid);
+				}
+			}
+		});
 	} else if (iSetAction == MessageSetAction.SetFlag) {
 		messages.forEach(oMessage =>
 			!oMessage.isFlagged() && rootUids.push(oMessage.uid) && oMessage.flags.push('\\flagged')

dev/View/User/MailBox/MessageList.js

@@ -219,7 +219,7 @@ export class MailMessageList extends AbstractViewRight {
 			MessagelistUserStore,
 			MessagelistUserStore.selectedMessage,
 			MessagelistUserStore.focusedMessage,
-			'.messageListItem .actionHandle',
+			'.messageListItem',
 			'.messageListItem .messageCheckbox',
 			'.messageListItem.focused'
 		);

integrations/nextcloud/snappymail/js/snappymail.js

@@ -141,3 +141,10 @@ function SnappyMailFormHelper(oForm)
 		console.error(e);
 	}
 }
+
+addEventListener('hashchange', (event) => {
+	const search = event.newURL.substring(event.newURL.lastIndexOf('/') + 1);
+	if (search && search.length < 25) {
+		document.getElementById('rliframe').contentWindow.rl.app.messageList.mainSearch(search);
+	}
+});

integrations/nextcloud/snappymail/lib/Search/Provider.php

@@ -91,12 +91,12 @@ class Provider implements IProvider
 			$MessageCollection = $oMailClient->MessageList($oParams);
 
 			$baseURL = $this->urlGenerator->linkToRoute('snappymail.page.index');
-			$config = \OC::$server->getConfig();
+//			$config = \OC::$server->getConfig();
-			if ($config->getAppValue('snappymail', 'snappymail-no-embed')) {
+//			if ($config->getAppValue('snappymail', 'snappymail-no-embed')) {
-				$baseURL .= '?target=';
+//				$baseURL .= '?target=';
-			} else {
+//			} else {
 				$baseURL .= '#';
-			}
+//			}
 			$search = \rawurlencode($oParams->sSearch);
 
 //			$MessageCollection->totalEmails;

snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html

@@ -139,7 +139,7 @@
 					<div class="flagParent fontastic"></div>
 					<div class="senderParent actionHandle" data-bind="attr: {'title': senderClearEmailsString}, text: senderEmailsString"></div>
 					<div class="subjectParent actionHandle" data-bind="text: subject"></div>
-					<div class="threads-len" data-bind="visible: 1 < threadsLen(), text: threadsLen, attr: {'data-unseen': threadUnseenLen() || null}"></div>
+					<div class="threads-len" data-bind="visible: 1 < threadsLen(), text: threadsLenText(), attr: {'data-unseen': threadUnseenLen() || null}"></div>
 					<div class="attachmentParent actionHandle">
 						<i data-bind="css: attachmentIconClass"></i>
 					</div>
@@ -159,7 +159,7 @@
 					<div class="flagParent fontastic"></div>
 					<div class="senderParent actionHandle" data-bind="attr: {'title': senderClearEmailsString}, text: senderEmailsString"></div>
 					<div class="subjectParent actionHandle" data-bind="text: subject"></div>
-					<div class="threads-len" data-bind="visible: 1 < threadsLen(), text: threadsLen"></div>
+					<div class="threads-len" data-bind="visible: 1 < threadsLen(), text: threadsLenText(), attr: {'data-unseen': threadUnseenLen() || null}"></div>
 					<div class="attachmentParent actionHandle">
 						<i data-bind="css: attachmentIconClass"></i>
 					</div>

vendors/squire/build/squire-raw.js

@@ -1345,6 +1345,7 @@ const
 				color = node.color,
 				newTag = createElement('SPAN'),
 				css = newTag.style;
+			newTag.style.cssText = node.style.cssText;
 			if (face) {
 				css.fontFamily = face;
 			}