Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 20:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved Contacts to check if changes should be saved

Browse source
This commit is contained in:
the-djmaze 2022-09-06 19:22:06 +02:00
parent c9ad0ef170
commit 2627a16c36
43 changed files with 102 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

26
dev/Model/Contact.js
View file

@ -93,7 +93,7 @@ export class ContactModel extends AbstractModel {
constructor() {
super();
this.jCard = new JCard();
this.jCard = ['vcard',[]];
this.addObservables({
focused: false,
@ -122,14 +122,13 @@ export class ContactModel extends AbstractModel {
this.addComputables({
hasValidName: () => !!(this.givenName() || this.surName()),
fullName: () => (this.givenName() + ' ' + this.surName()).trim(),
fullName: () => [this.namePrefix(), this.givenName(), this.middleName(), this.surName()].join(' ').trim(),
display: () => {
let a = this.jCard.getOne('fn')?.value,
b = this.fullName(),
c = this.jCard.getOne('email')?.value,
d = this.nickname();
return a || b || c || d;
let a = this.fullName(),
b = this.email()?.[0]?.value,
c = this.nickname();
return a || b || c;
}
/*
fullName: {
@ -200,12 +199,12 @@ export class ContactModel extends AbstractModel {
});
});
props = jCard.getOne('x-Crypto');
props = jCard.getOne('x-crypto');
contact.signpref(props?.params.signpref || 'Ask');
contact.encryptpref(props?.params.encryptpref || 'Ask');
// contact.encryptpref(props?.params.allowed || 'PGP/INLINE,PGP/MIME,S/MIME,S/MIMEOpaque');
contact.jCard = jCard;
contact.jCard = json.jCard;
}
return contact;
}
@ -246,9 +245,14 @@ export class ContactModel extends AbstractModel {
this.nickname() || this.nickname('');
}
hasChanges()
{
return this.toJSON().jCard != JSON.stringify(this.jCard);
}
toJSON()
{
let jCard = this.jCard;
let jCard = new JCard(this.jCard);
jCard.set('n', [
this.surName(),
this.givenName(),
@ -273,7 +277,7 @@ export class ContactModel extends AbstractModel {
values.forEach(value => value && jCard.add(field, value));
});
jCard.set('x-Crypto', '', {
jCard.set('x-crypto', '', {
allowed: 'PGP/INLINE,PGP/MIME,S/MIME,S/MIMEOpaque',
signpref: this.signpref(),
encryptpref: this.encryptpref()