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

Drop message.deleted observable

Browse source
This commit is contained in:
the-djmaze 2024-07-14 23:29:12 +02:00
parent d7bf80ea79
commit 93869315c1
4 changed files with 3 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dev/Model/Message.js
View file

@ -159,8 +159,6 @@ export class MessageModel extends AbstractModel {
dateTimestamp: 0, dateTimestamp: 0,
dateTimestampSource: 0, dateTimestampSource: 0,
deleted: false,
// Also used by Selector // Also used by Selector
focused: false, focused: false,
selected: false, selected: false,
@ -364,7 +362,6 @@ export class MessageModel extends AbstractModel {
lineAsCss(flags=1) { lineAsCss(flags=1) {
let classes = []; let classes = [];
forEachObjectEntry({ forEachObjectEntry({
deleted: this.deleted() || this.isDeleted(),
selected: this.selected(), selected: this.selected(),
checked: this.checked(), checked: this.checked(),
unseen: this.isUnseen(), unseen: this.isUnseen(),

10
dev/Model/MessageCollection.js
View file

@ -28,14 +28,10 @@ export class MessageCollectionModel extends AbstractCollectionModel
*/ */
static reviveFromJson(object/*, cached*/) { static reviveFromJson(object/*, cached*/) {
let msg = MessageUserStore.message(); let msg = MessageUserStore.message();
return super.reviveFromJson(object, message => { return super.reviveFromJson(object, message =>
// If message is currently viewed, use that. // If message is currently viewed, use that.
// Maybe then use msg.revivePropertiesFromJson(message) ? // Maybe then use msg.revivePropertiesFromJson(message) ?
message = (msg && msg.hash === message.hash) ? msg : MessageModel.reviveFromJson(message); (msg && msg.hash === message.hash) ? msg : MessageModel.reviveFromJson(message)
if (message) { );
message.deleted(false);
return message;
}
});
} }
} }

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

@ -470,23 +470,6 @@ MessagelistUserStore.moveMessages = (
if (page > MessagelistUserStore.pageCount()) { if (page > MessagelistUserStore.pageCount()) {
setPage = MessagelistUserStore.pageCount(); setPage = MessagelistUserStore.pageCount();
} }
if (MessagelistUserStore.threadUid()
&& MessagelistUserStore.length
&& MessagelistUserStore.find(item => item?.deleted() && item.uid == MessagelistUserStore.threadUid())
) {
const message = MessagelistUserStore.find(item => item && !item.deleted());
if (!message) {
if (1 < page) {
setPage = page - 1;
} else {
MessagelistUserStore.threadUid(0);
setPage = MessagelistUserStore.pageBeforeThread();
}
} else if (MessagelistUserStore.threadUid() != message.uid) {
MessagelistUserStore.threadUid(message.uid);
setPage = page;
}
}
if (setPage) { if (setPage) {
MessagelistUserStore.page(setPage); MessagelistUserStore.page(setPage);
replaceHash( replaceHash(
@ -544,7 +527,6 @@ MessagelistUserStore.moveMessages = (
currentMessage = null; currentMessage = null;
MessageUserStore.message(null); MessageUserStore.message(null);
} }
item.deleted(true);
MessagelistUserStore.remove(item); MessagelistUserStore.remove(item);
}); });
} }

4
dev/Styles/User/MessageList.less
View file

@ -207,10 +207,6 @@
font-weight: bolder; font-weight: bolder;
} }
&.deleted {
opacity: .3;
}
.messageCheckbox { .messageCheckbox {
font-size: 114%; font-size: 114%;
padding: 5px .5em 0; padding: 5px .5em 0;