Fix Forward Multiple Messages (fixed #64)

This commit is contained in:
RainLoop Team 2014-02-05 21:16:34 +04:00
parent 7a411cea86
commit d50c068a3d
4 changed files with 42 additions and 28 deletions

View file

@ -425,20 +425,27 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
oIDs[RL.data().accountEmail()] = RL.data().accountEmail(); oIDs[RL.data().accountEmail()] = RL.data().accountEmail();
switch (sComposeType) if (oMessage)
{ {
case Enums.ComposeType.Empty: switch (sComposeType)
sResult = RL.data().accountEmail(); {
break; case Enums.ComposeType.Empty:
case Enums.ComposeType.Reply: case Enums.ComposeType.ForwardAsAttachment:
case Enums.ComposeType.ReplyAll: sResult = RL.data().accountEmail();
case Enums.ComposeType.Forward: break;
case Enums.ComposeType.ForwardAsAttachment: case Enums.ComposeType.Reply:
_.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper); case Enums.ComposeType.ReplyAll:
break; case Enums.ComposeType.Forward:
case Enums.ComposeType.Draft: _.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper);
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper); break;
break; case Enums.ComposeType.Draft:
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper);
break;
}
}
else
{
sResult = RL.data().accountEmail();
} }
return sResult; return sResult;

View file

@ -2,7 +2,7 @@
"name": "RainLoop", "name": "RainLoop",
"title": "RainLoop Webmail", "title": "RainLoop Webmail",
"version": "1.6.2", "version": "1.6.2",
"release": "671", "release": "672",
"description": "Simple, modern & fast web-based email client", "description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net", "homepage": "http://rainloop.net",
"main": "Gruntfile.js", "main": "Gruntfile.js",

View file

@ -8492,20 +8492,27 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
oIDs[RL.data().accountEmail()] = RL.data().accountEmail(); oIDs[RL.data().accountEmail()] = RL.data().accountEmail();
switch (sComposeType) if (oMessage)
{ {
case Enums.ComposeType.Empty: switch (sComposeType)
sResult = RL.data().accountEmail(); {
break; case Enums.ComposeType.Empty:
case Enums.ComposeType.Reply: case Enums.ComposeType.ForwardAsAttachment:
case Enums.ComposeType.ReplyAll: sResult = RL.data().accountEmail();
case Enums.ComposeType.Forward: break;
case Enums.ComposeType.ForwardAsAttachment: case Enums.ComposeType.Reply:
_.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper); case Enums.ComposeType.ReplyAll:
break; case Enums.ComposeType.Forward:
case Enums.ComposeType.Draft: _.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper);
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper); break;
break; case Enums.ComposeType.Draft:
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper);
break;
}
}
else
{
sResult = RL.data().accountEmail();
} }
return sResult; return sResult;

File diff suppressed because one or more lines are too long