Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-31 13:09:21 +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

12
dev/Common/Selector.js
View file

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

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'
);