diff --git a/dev/Model/Contact.js b/dev/Model/Contact.js index 6294a4140..d31d65638 100644 --- a/dev/Model/Contact.js +++ b/dev/Model/Contact.js @@ -135,29 +135,6 @@ export class ContactModel extends AbstractModel { }); } - /** - * @returns {Array|null} - */ - getNameAndEmailHelper() { - let name = (this.givenName() + ' ' + this.surName()).trim(), - email = [], - addresses = this.email(); - - if (this.sendToAll()) { - addresses.forEach(key => email.push(key.value())); - } else if (addresses.length) { - email.push(addresses[0].value()); - } -/* -// this.jCard.getOne('fn')?.notEmpty() || - this.jCard.parseFullName({set:true}); -// let name = this.jCard.getOne('nickname'), - let name = this.jCard.getOne('fn'), - email = [this.jCard.getOne('email')]; -*/ - return email.length ? [name, email] : null; - } - /** * @static * @param {jCard} json diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js index 3a3714f56..f9f039f5d 100644 --- a/dev/View/Popup/Contacts.js +++ b/dev/View/Popup/Contacts.js @@ -137,12 +137,24 @@ export class ContactsPopupView extends AbstractViewPopup { recipients = {to:null,cc:null,bcc:null}; this.contactsCheckedOrSelected().forEach(oContact => { - const data = oContact?.getNameAndEmailHelper(); - if (data) { - data[1].forEach(address => { - let email = new EmailModel(address, data[0]); + if (oContact) { + let name = (oContact.givenName() + ' ' + oContact.surName()).trim(), + email, + addresses = oContact.email(); + if (!oContact.sendToAll()) { + addresses = addresses.slice(0,1); + } + addresses.forEach(address => { + email = new EmailModel(address, name); email.valid() && aE.push(email); }); +/* + // oContact.jCard.getOne('fn')?.notEmpty() || + oContact.jCard.parseFullName({set:true}); + // let name = oContact.jCard.getOne('nickname'), + let name = oContact.jCard.getOne('fn'), + email = [oContact.jCard.getOne('email')]; +*/ } });