Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1248 from SergeyMosin/some-fixes

Browse source 
Some fixes
This commit is contained in:
the-djmaze 2023-10-01 11:46:05 +02:00 • committed by GitHub
commit 7a49d55736
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 47 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dev/Common/Selector.js
View file

@ -200,9 +200,17 @@ export class Selector {
addEventsListeners(contentScrollable, {
click: 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) {
if (event.shiftKey) {

5
dev/Model/Message.js
View file

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

22
dev/Stores/User/Messagelist.js
View file

@ -344,13 +344,23 @@ MessagelistUserStore.setAction = (sFolderFullName, iSetAction, messages) => {
length;
if (iSetAction == MessageSetAction.SetSeen) {
messages.forEach(oMessage =>
oMessage.isUnseen() && rootUids.push(oMessage.uid) && oMessage.flags.push('\\seen')
);
messages.forEach(oMessage => {
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 =>
!oMessage.isUnseen() && rootUids.push(oMessage.uid) && oMessage.flags.remove('\\seen')
);
messages.forEach(oMessage => {
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')

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

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

7
integrations/nextcloud/snappymail/js/snappymail.js
View file

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

10
integrations/nextcloud/snappymail/lib/Search/Provider.php
View file

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

4
snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
View file

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

1
vendors/squire/build/squire-raw.js vendored
View file

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