mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-12-29 02:51:48 +08:00
Fix Forward Multiple Messages (fixed #64)
This commit is contained in:
parent
7a411cea86
commit
d50c068a3d
4 changed files with 42 additions and 28 deletions
|
@ -425,20 +425,27 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
|
|||
|
||||
oIDs[RL.data().accountEmail()] = RL.data().accountEmail();
|
||||
|
||||
switch (sComposeType)
|
||||
if (oMessage)
|
||||
{
|
||||
case Enums.ComposeType.Empty:
|
||||
sResult = RL.data().accountEmail();
|
||||
break;
|
||||
case Enums.ComposeType.Reply:
|
||||
case Enums.ComposeType.ReplyAll:
|
||||
case Enums.ComposeType.Forward:
|
||||
case Enums.ComposeType.ForwardAsAttachment:
|
||||
_.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper);
|
||||
break;
|
||||
case Enums.ComposeType.Draft:
|
||||
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper);
|
||||
break;
|
||||
switch (sComposeType)
|
||||
{
|
||||
case Enums.ComposeType.Empty:
|
||||
case Enums.ComposeType.ForwardAsAttachment:
|
||||
sResult = RL.data().accountEmail();
|
||||
break;
|
||||
case Enums.ComposeType.Reply:
|
||||
case Enums.ComposeType.ReplyAll:
|
||||
case Enums.ComposeType.Forward:
|
||||
_.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper);
|
||||
break;
|
||||
case Enums.ComposeType.Draft:
|
||||
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
sResult = RL.data().accountEmail();
|
||||
}
|
||||
|
||||
return sResult;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"name": "RainLoop",
|
||||
"title": "RainLoop Webmail",
|
||||
"version": "1.6.2",
|
||||
"release": "671",
|
||||
"release": "672",
|
||||
"description": "Simple, modern & fast web-based email client",
|
||||
"homepage": "http://rainloop.net",
|
||||
"main": "Gruntfile.js",
|
||||
|
|
|
@ -8492,20 +8492,27 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
|
|||
|
||||
oIDs[RL.data().accountEmail()] = RL.data().accountEmail();
|
||||
|
||||
switch (sComposeType)
|
||||
if (oMessage)
|
||||
{
|
||||
case Enums.ComposeType.Empty:
|
||||
sResult = RL.data().accountEmail();
|
||||
break;
|
||||
case Enums.ComposeType.Reply:
|
||||
case Enums.ComposeType.ReplyAll:
|
||||
case Enums.ComposeType.Forward:
|
||||
case Enums.ComposeType.ForwardAsAttachment:
|
||||
_.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper);
|
||||
break;
|
||||
case Enums.ComposeType.Draft:
|
||||
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper);
|
||||
break;
|
||||
switch (sComposeType)
|
||||
{
|
||||
case Enums.ComposeType.Empty:
|
||||
case Enums.ComposeType.ForwardAsAttachment:
|
||||
sResult = RL.data().accountEmail();
|
||||
break;
|
||||
case Enums.ComposeType.Reply:
|
||||
case Enums.ComposeType.ReplyAll:
|
||||
case Enums.ComposeType.Forward:
|
||||
_.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper);
|
||||
break;
|
||||
case Enums.ComposeType.Draft:
|
||||
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
sResult = RL.data().accountEmail();
|
||||
}
|
||||
|
||||
return sResult;
|
||||
|
|
2
rainloop/v/0.0.0/static/js/app.min.js
vendored
2
rainloop/v/0.0.0/static/js/app.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue