Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-01 21:49:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged from sub repository (updated ckeditor, filters - step 3)

Browse source 
Release commit
This commit is contained in:
RainLoop Team 2014-12-06 01:01:33 +04:00
parent ec7324b061
commit 42b8a446c6
464 changed files with 10395 additions and 1303 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dev/View/Popup/Compose.js
View file

@ -461,9 +461,12 @@
var
oIDs = {},
sResult = '',
sEmail = '',
fFindHelper = function (oItem) {
if (oItem && oItem.email && oIDs[oItem.email])
{
sEmail = oItem.email;
sResult = oIDs[oItem.email];
return true;
}
@ -507,9 +510,10 @@
if ('' === sResult)
{
sResult = Data.accountEmail();
sEmail = sResult;
}
return sResult;
return [sResult, sEmail];
};
ComposePopupView.prototype.selectIdentity = function (oIdentity)
@ -744,6 +748,7 @@
sReplyTitle = '',
aResplyAllParts = [],
oExcludeEmail = {},
oIdResult = null,
mEmail = Data.accountEmail(),
sSignature = Data.signature(),
bSignatureToAll = Data.signatureToAll(),
@ -780,7 +785,13 @@
oExcludeEmail[mEmail] = true;
}
this.currentIdentityID(this.findIdentityIdByMessage(sComposeType, oMessage));
oIdResult = this.findIdentityIdByMessage(sComposeType, oMessage);
if (oIdResult && oIdResult[0])
{
oExcludeEmail[oIdResult[1]] = true;
this.currentIdentityID(oIdResult[0]);
}
this.reset();
if (Utils.isNonEmptyArray(aToEmails))