Improved #1286 to be in line with all code

This commit is contained in:
the-djmaze 2023-12-11 11:38:38 +01:00
parent 65d469f71a
commit 08257f47cb
42 changed files with 98 additions and 65 deletions

View file

@ -140,24 +140,22 @@ export class ContactModel extends AbstractModel {
*/
getNameAndEmailHelper() {
let name = (this.givenName() + ' ' + this.surName()).trim(),
email;
email = [],
addresses = this.email();
if (this.sendToAll()) {
email = [];
this.email().forEach(function (key){
email.push(key?.value())
});
} else {
email = this.email()[0]?.value();
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');
email = [this.jCard.getOne('email')];
*/
return email ? [email, name] : null;
return email.length ? [name, email] : null;
}
/**
@ -332,10 +330,6 @@ export class ContactModel extends AbstractModel {
+ (this.focused() ? ' focused' : '');
}
sendToAllDefaultValue() {
return (this.sendToAll() ? ' checked' : '');
}
sendToAllDisplayStatus() {
return this.email.length > 1
}

View file

@ -145,7 +145,7 @@
margin: 0;
overflow: auto;
span {
:not(.e-checkbox) > span {
height: 20px;
line-height: 20px;
display: none;
@ -170,11 +170,6 @@
width: 70vw;
max-width: 400px;
}
#send-to-all > input[type="checkbox"] {
margin-left: 2px;
margin-right: 10px;
}
}
.read-only-sign {

View file

@ -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(),

View file

@ -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)) {

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "تاريخ الميلاد",
"ADD_MENU_TAGS": "Tags",
"BUTTON_SHARE_ALL": "الجميع",
"BUTTON_SYNC": "المزامنة (CardDAV)"
"BUTTON_SYNC": "المزامنة (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "إظهار جميع الحقول",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Рожден ден",
"ADD_MENU_TAGS": "Етикети",
"BUTTON_SHARE_ALL": "Всички",
"BUTTON_SYNC": "Синхронизация (CardDAV)"
"BUTTON_SYNC": "Синхронизация (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "покажи всички полета",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Narozeniny",
"ADD_MENU_TAGS": "Tagy",
"BUTTON_SHARE_ALL": "Vše",
"BUTTON_SYNC": "Synchronizace (CardDAV)"
"BUTTON_SYNC": "Synchronizace (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "zobrazit všechna pole",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Fødselsdag",
"ADD_MENU_TAGS": "Mærkater",
"BUTTON_SHARE_ALL": "Alle",
"BUTTON_SYNC": "Synkronisering (CardDAV)"
"BUTTON_SYNC": "Synkronisering (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Vis alle felter",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Geburtstag",
"ADD_MENU_TAGS": "Schlagwörter",
"BUTTON_SHARE_ALL": "Jeder",
"BUTTON_SYNC": "Synchronisierung (CardDAV)"
"BUTTON_SYNC": "Synchronisierung (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "alle Felder anzeigen",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Γενέθλια",
"ADD_MENU_TAGS": "Ετικέτες",
"BUTTON_SHARE_ALL": "Όλοι",
"BUTTON_SYNC": "Συγχρονισμός (CardDAV)"
"BUTTON_SYNC": "Συγχρονισμός (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Εμφάνισε όλα τα πεδία",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Birthday",
"ADD_MENU_TAGS": "Tags",
"BUTTON_SHARE_ALL": "Everyone",
"BUTTON_SYNC": "Synchronization (CardDAV)"
"BUTTON_SYNC": "Synchronization (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "show all fields",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Cumpleaños",
"ADD_MENU_TAGS": "Etiquetas",
"BUTTON_SHARE_ALL": "Todos",
"BUTTON_SYNC": "Sincronización (CardDAV)"
"BUTTON_SYNC": "Sincronización (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "mostrar todos los campos",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Sünnipäev",
"ADD_MENU_TAGS": "Sildid",
"BUTTON_SHARE_ALL": "Kõigiga",
"BUTTON_SYNC": "Sünkroniseerimine (CardDAV)"
"BUTTON_SYNC": "Sünkroniseerimine (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "näita kõiki väljasid",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Urtebetetzea",
"ADD_MENU_TAGS": "Etiketak",
"BUTTON_SHARE_ALL": "Denak",
"BUTTON_SYNC": "Sinkronizazioa (CardDAV)"
"BUTTON_SYNC": "Sinkronizazioa (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "erakutsi eremu guztiak",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "تاریخ تولد",
"ADD_MENU_TAGS": "برچسب",
"BUTTON_SHARE_ALL": "هرکسی",
"BUTTON_SYNC": "همگام‌سازی (CardDAV)"
"BUTTON_SYNC": "همگام‌سازی (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "نمایش همه فیلدها",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Syntymäpäivä",
"ADD_MENU_TAGS": "Tagit",
"BUTTON_SHARE_ALL": "Kaikille",
"BUTTON_SYNC": "Synkronoi (CardDAV)"
"BUTTON_SYNC": "Synkronoi (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "näytä kaikki kentät",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Anniversaire",
"ADD_MENU_TAGS": "Étiquettes",
"BUTTON_SHARE_ALL": "Tout le monde",
"BUTTON_SYNC": "Synchronisation (CardDAV)"
"BUTTON_SYNC": "Synchronisation (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Voir tous les champs",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Születésnap",
"ADD_MENU_TAGS": "Címkék",
"BUTTON_SHARE_ALL": "Mindenki",
"BUTTON_SYNC": "Szinkronizálás (CardDAV)"
"BUTTON_SYNC": "Szinkronizálás (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "összes mező",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Tanggal lahir",
"ADD_MENU_TAGS": "Penanda",
"BUTTON_SHARE_ALL": "Semuanya",
"BUTTON_SYNC": "Sinkronisasi (CardDAV)"
"BUTTON_SYNC": "Sinkronisasi (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "tampikan semua isian",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Afmælisdagur",
"ADD_MENU_TAGS": "Merki",
"BUTTON_SHARE_ALL": "Allir",
"BUTTON_SYNC": "Samstilling (CardDAV)"
"BUTTON_SYNC": "Samstilling (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "sýna alla reiti",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Compleanno",
"ADD_MENU_TAGS": "Tag",
"BUTTON_SHARE_ALL": "Tutti",
"BUTTON_SYNC": "Sincronizzazione (CardDAV)"
"BUTTON_SYNC": "Sincronizzazione (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Visualizza tutti i campi",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "誕生日",
"ADD_MENU_TAGS": "タグ",
"BUTTON_SHARE_ALL": "すべて",
"BUTTON_SYNC": "同期(CardDAV)"
"BUTTON_SYNC": "同期(CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "すべて表示",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "생일",
"ADD_MENU_TAGS": "태그",
"BUTTON_SHARE_ALL": "전원",
"BUTTON_SYNC": "동기화 (CardDAV)"
"BUTTON_SYNC": "동기화 (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "모든 필드 표시",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Gimtadienis",
"ADD_MENU_TAGS": "Žymos",
"BUTTON_SHARE_ALL": "Visiems",
"BUTTON_SYNC": "Sinchronizavimas (CardDAV)"
"BUTTON_SYNC": "Sinchronizavimas (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "rodyti visus laukus",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Birthday",
"ADD_MENU_TAGS": "Tags",
"BUTTON_SHARE_ALL": "Everyone",
"BUTTON_SYNC": "Synchronization (CardDAV)"
"BUTTON_SYNC": "Synchronization (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "rādīt visus laukus",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Bursdag",
"ADD_MENU_TAGS": "Tagger",
"BUTTON_SHARE_ALL": "Alle",
"BUTTON_SYNC": "Synkronisering (CardDAV)"
"BUTTON_SYNC": "Synkronisering (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Vis alle felt",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Geboortedatum",
"ADD_MENU_TAGS": "Labels",
"BUTTON_SHARE_ALL": "Iedereen",
"BUTTON_SYNC": "Synchroniseren (CardDAV)"
"BUTTON_SYNC": "Synchroniseren (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Toon alle velden",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Urodziny",
"ADD_MENU_TAGS": "Tagi",
"BUTTON_SHARE_ALL": "Wszystkim",
"BUTTON_SYNC": "Synchronizacja (CardDAV)"
"BUTTON_SYNC": "Synchronizacja (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Pokaż wszystkie pola",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Aniversário",
"ADD_MENU_TAGS": "Tags",
"BUTTON_SHARE_ALL": "Todos",
"BUTTON_SYNC": "Sincronização (CardDAV)"
"BUTTON_SYNC": "Sincronização (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Exibir todos os campos",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Aniversário",
"ADD_MENU_TAGS": "Etiquetas",
"BUTTON_SHARE_ALL": "Todos",
"BUTTON_SYNC": "Sincronização (CardDAV)"
"BUTTON_SYNC": "Sincronização (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Mostrar todos os campos",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Aniversário",
"ADD_MENU_TAGS": "Etiquetas",
"BUTTON_SHARE_ALL": "Todos",
"BUTTON_SYNC": "Sincronização (CardDAV)"
"BUTTON_SYNC": "Sincronização (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Mostrar todos os campos",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Birthday",
"ADD_MENU_TAGS": "Tags",
"BUTTON_SHARE_ALL": "Toate",
"BUTTON_SYNC": "Synchronization (CardDAV)"
"BUTTON_SYNC": "Synchronization (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Extinde",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "День рождения",
"ADD_MENU_TAGS": "Теги",
"BUTTON_SHARE_ALL": "Всем",
"BUTTON_SYNC": "Синхронизация (CardDAV)"
"BUTTON_SYNC": "Синхронизация (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Показать все поля",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Dátum narodenia",
"ADD_MENU_TAGS": "Značky",
"BUTTON_SHARE_ALL": "Všetko",
"BUTTON_SYNC": "Synchronizácia (CardDAV)"
"BUTTON_SYNC": "Synchronizácia (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "zobraziť všetky polia",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Rojstni dan",
"ADD_MENU_TAGS": "Značke",
"BUTTON_SHARE_ALL": "Vse",
"BUTTON_SYNC": "Sinhronizacija (CardDAV)"
"BUTTON_SYNC": "Sinhronizacija (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "prikaz vseh polj",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Födelsedag",
"ADD_MENU_TAGS": "Taggar",
"BUTTON_SHARE_ALL": "Alla",
"BUTTON_SYNC": "Synkronisering (CardDAV)"
"BUTTON_SYNC": "Synkronisering (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "visa alla fält",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Doğum Günü",
"ADD_MENU_TAGS": "Etiketler",
"BUTTON_SHARE_ALL": "Herkes",
"BUTTON_SYNC": "Senkronize Et (CardDAV)"
"BUTTON_SYNC": "Senkronize Et (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "tüm alanları görüntüle",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "День народження",
"ADD_MENU_TAGS": "Теги",
"BUTTON_SHARE_ALL": "Всім",
"BUTTON_SYNC": "Синхронизація (CardDAV)"
"BUTTON_SYNC": "Синхронизація (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "Показати всі поля",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "Ngày sinh",
"ADD_MENU_TAGS": "Thẻ",
"BUTTON_SHARE_ALL": "Tất cả mọi người",
"BUTTON_SYNC": "Đồng bộ hóa (CardDAV)"
"BUTTON_SYNC": "Đồng bộ hóa (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "hiển thị tất cả mục nhập thông tin",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "生日",
"ADD_MENU_TAGS": "标签",
"BUTTON_SHARE_ALL": "所有人",
"BUTTON_SYNC": "同步 (CardDAV)"
"BUTTON_SYNC": "同步 (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "显示所有信息",

View file

@ -209,7 +209,8 @@
"ADD_MENU_BIRTHDAY": "生日",
"ADD_MENU_TAGS": "標籤",
"BUTTON_SHARE_ALL": "所有人",
"BUTTON_SYNC": "同步 (CardDAV)"
"BUTTON_SYNC": "同步 (CardDAV)",
"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
},
"COMPOSE": {
"LINK_SHOW_INPUTS": "顯示所有欄位",

View file

@ -134,10 +134,13 @@
<div class="control-group" data-bind="email().length">
<label class="fontastic iconsize24" data-i18n="[title]GLOBAL/EMAIL">@</label>
<div>
<div id="send-to-all" class="property-line" data-bind="visible: sendToAllDisplayStatus()">
<input type="checkbox" data-bind="checked: sendToAll, css: sendToAllDefaultValue()">
<label class="e-component e-checkbox material-design">
<div>
<input type="checkbox" data-bind="checked: sendToAll"/>
<div role="checkbox"></div>
</div>
<span data-i18n="CONTACTS/SEND_TO_ALL_CONTACT_EMAILS"></span>
</div>
</label>
<div data-bind="foreach: email">
<div class="property-line">