mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-09-20 07:35:55 +08:00
Resolve #1654
This commit is contained in:
parent
3161961faa
commit
becaaaa2fd
|
@ -28,10 +28,15 @@ export class MessageCollectionModel extends AbstractCollectionModel
|
|||
*/
|
||||
static reviveFromJson(object/*, cached*/) {
|
||||
let msg = MessageUserStore.message();
|
||||
return super.reviveFromJson(object, message =>
|
||||
return super.reviveFromJson(object, message => {
|
||||
// If message is currently viewed, use that.
|
||||
// Maybe then use msg.revivePropertiesFromJson(message) ?
|
||||
(msg && msg.hash === message.hash) ? msg : MessageModel.reviveFromJson(message)
|
||||
);
|
||||
if (msg && msg.hash === message.hash) {
|
||||
msg.revivePropertiesFromJson(message);
|
||||
message = msg;
|
||||
} else {
|
||||
message = MessageModel.reviveFromJson(message);
|
||||
}
|
||||
return message;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue