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

Update ckeditor

Browse source 
Move e2e tests
Code refactoring
This commit is contained in:
RainLoop Team 2016-09-12 23:50:21 +03:00
parent 9993432c7b
commit e5af98b04b
122 changed files with 617 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/Model/Message.js
View file

@ -16,6 +16,9 @@ import {
import {$win} from 'Common/Globals';
import {messageViewLink, messageDownloadLink} from 'Common/Links';
import FolderStore from 'Stores/User/Folder';
import PgpStore from 'Stores/User/Pgp';
import {emailArrayFromJson, emailArrayToStringClear, emailArrayToString, replyHelper} from 'Helper/Message';
import {AttachmentModel, staticCombinedIconClass} from 'Model/Attachment';
@ -211,8 +214,8 @@ class MessageModel extends AbstractModel
computeSenderEmail() {
const
sentFolder = require('Stores/User/Folder').sentFolder(),
draftFolder = require('Stores/User/Folder').draftFolder();
sentFolder = FolderStore.sentFolder(),
draftFolder = FolderStore.draftFolder();
this.senderEmailsString(this.folderFullNameRaw === sentFolder || this.folderFullNameRaw === draftFolder ?
this.toEmailsString() : this.fromEmailString());
@ -307,7 +310,7 @@ class MessageModel extends AbstractModel
this.proxy = !!json.ExternalProxy;
if (require('Stores/User/Pgp').capaOpenPGP())
if (PgpStore.capaOpenPGP())
{
this.isPgpSigned(!!json.PgpSigned);
this.isPgpEncrypted(!!json.PgpEncrypted);