mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-30 12:39:20 +03:00
Improved #1286 to be in line with all code
This commit is contained in:
parent
65d469f71a
commit
08257f47cb
42 changed files with 98 additions and 65 deletions
|
|
@ -1381,13 +1381,13 @@ export class ComposePopupView extends AbstractViewPopup {
|
|||
};
|
||||
}
|
||||
});
|
||||
|
||||
/*
|
||||
let sToAddress = this.to();
|
||||
|
||||
if (/".*" <.*,.*>/g.test(sToAddress)) {
|
||||
sToAddress = sToAddress.match(/<.*>/g)[0].replace(/[<>]/g, '');
|
||||
}
|
||||
|
||||
*/
|
||||
const
|
||||
identity = this.currentIdentity(),
|
||||
params = {
|
||||
|
|
@ -1396,7 +1396,7 @@ export class ComposePopupView extends AbstractViewPopup {
|
|||
messageUid: this.draftUid(),
|
||||
saveFolder: sSaveFolder,
|
||||
from: this.from(),
|
||||
to: sToAddress,
|
||||
to: this.to(),
|
||||
cc: this.cc(),
|
||||
bcc: this.bcc(),
|
||||
replyTo: this.replyTo(),
|
||||
|
|
|
|||
|
|
@ -137,9 +137,13 @@ export class ContactsPopupView extends AbstractViewPopup {
|
|||
recipients = {to:null,cc:null,bcc:null};
|
||||
|
||||
this.contactsCheckedOrSelected().forEach(oContact => {
|
||||
const data = oContact?.getNameAndEmailHelper(),
|
||||
email = data ? new EmailModel(data[0], data[1]) : null;
|
||||
email?.valid() && aE.push(email);
|
||||
const data = oContact?.getNameAndEmailHelper();
|
||||
if (data) {
|
||||
data[1].forEach(address => {
|
||||
let email = new EmailModel(address, data[0]);
|
||||
email.valid() && aE.push(email);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
if (arrayLength(aE)) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue