Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-10 06:58:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added "Default identity" setting (Closes #157)

Browse source
This commit is contained in:
RainLoop Team 2014-07-16 22:57:17 +04:00
parent c82a897582
commit d80a9e8485
29 changed files with 239 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dev/ViewModels/PopupsComposeViewModel.js
View file

@ -91,7 +91,7 @@ function PopupsComposeViewModel()
this.composeEditorArea = ko.observable(null);
this.identities = RL.data().identities;
this.defaultIdentityID = RL.data().defaultIdentityID;
this.currentIdentityID = ko.observable('');
this.currentIdentityString = ko.observable('');
@ -433,7 +433,6 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
switch (sComposeType)
{
case Enums.ComposeType.Empty:
sResult = RL.data().accountEmail();
break;
case Enums.ComposeType.Reply:
case Enums.ComposeType.ReplyAll:
@ -446,7 +445,13 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
break;
}
}
else
if ('' === sResult)
{
sResult = this.defaultIdentityID();
}
if ('' === sResult)
{
sResult = RL.data().accountEmail();
}
@ -694,9 +699,9 @@ PopupsComposeViewModel.prototype.onShow = function (sType, oMessageOrArray, aToE
if (null !== mEmail)
{
oExcludeEmail[mEmail] = true;
this.currentIdentityID(this.findIdentityIdByMessage(sComposeType, oMessage));
}
this.currentIdentityID(this.findIdentityIdByMessage(sComposeType, oMessage));
this.reset();
if (Utils.isNonEmptyArray(aToEmails))