mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03: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,21 +425,28 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
|
||||||
|
|
||||||
oIDs[RL.data().accountEmail()] = RL.data().accountEmail();
|
oIDs[RL.data().accountEmail()] = RL.data().accountEmail();
|
||||||
|
|
||||||
|
if (oMessage)
|
||||||
|
{
|
||||||
switch (sComposeType)
|
switch (sComposeType)
|
||||||
{
|
{
|
||||||
case Enums.ComposeType.Empty:
|
case Enums.ComposeType.Empty:
|
||||||
|
case Enums.ComposeType.ForwardAsAttachment:
|
||||||
sResult = RL.data().accountEmail();
|
sResult = RL.data().accountEmail();
|
||||||
break;
|
break;
|
||||||
case Enums.ComposeType.Reply:
|
case Enums.ComposeType.Reply:
|
||||||
case Enums.ComposeType.ReplyAll:
|
case Enums.ComposeType.ReplyAll:
|
||||||
case Enums.ComposeType.Forward:
|
case Enums.ComposeType.Forward:
|
||||||
case Enums.ComposeType.ForwardAsAttachment:
|
|
||||||
_.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper);
|
_.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper);
|
||||||
break;
|
break;
|
||||||
case Enums.ComposeType.Draft:
|
case Enums.ComposeType.Draft:
|
||||||
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper);
|
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sResult = RL.data().accountEmail();
|
||||||
|
}
|
||||||
|
|
||||||
return sResult;
|
return sResult;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -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",
|
||||||
|
|
|
||||||
|
|
@ -8492,21 +8492,28 @@ PopupsComposeViewModel.prototype.findIdentityIdByMessage = function (sComposeTyp
|
||||||
|
|
||||||
oIDs[RL.data().accountEmail()] = RL.data().accountEmail();
|
oIDs[RL.data().accountEmail()] = RL.data().accountEmail();
|
||||||
|
|
||||||
|
if (oMessage)
|
||||||
|
{
|
||||||
switch (sComposeType)
|
switch (sComposeType)
|
||||||
{
|
{
|
||||||
case Enums.ComposeType.Empty:
|
case Enums.ComposeType.Empty:
|
||||||
|
case Enums.ComposeType.ForwardAsAttachment:
|
||||||
sResult = RL.data().accountEmail();
|
sResult = RL.data().accountEmail();
|
||||||
break;
|
break;
|
||||||
case Enums.ComposeType.Reply:
|
case Enums.ComposeType.Reply:
|
||||||
case Enums.ComposeType.ReplyAll:
|
case Enums.ComposeType.ReplyAll:
|
||||||
case Enums.ComposeType.Forward:
|
case Enums.ComposeType.Forward:
|
||||||
case Enums.ComposeType.ForwardAsAttachment:
|
|
||||||
_.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper);
|
_.find(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fFindHelper);
|
||||||
break;
|
break;
|
||||||
case Enums.ComposeType.Draft:
|
case Enums.ComposeType.Draft:
|
||||||
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper);
|
_.find(_.union(oMessage.from, oMessage.replyTo), fFindHelper);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sResult = RL.data().accountEmail();
|
||||||
|
}
|
||||||
|
|
||||||
return sResult;
|
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…
Add table
Add a link
Reference in a new issue