the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-01-02 21:12:02 +08:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup EmailModel

Browse source
This commit is contained in:
the-djmaze 2023-02-13 17:05:44 +01:00
parent ceac15ace9
commit 974acaab90
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dev/Model/Email.js
View file

@ -220,22 +220,13 @@ export class EmailModel extends AbstractModel {
static reviveFromJson(json) {
const email = super.reviveFromJson(json);
email?.cleanup();
return email?.validate() ? email : null;
}
/**
* @returns {void}
*/
clear() {
this.email = '';
this.name = '';
this.dkimStatus = 'none';
return email?.valid() ? email : null;
}
/**
* @returns {boolean}
*/
validate() {
valid() {
return this.name || this.email;
}
@ -248,14 +239,6 @@ export class EmailModel extends AbstractModel {
}
}
/**
* @param {string} query
* @returns {boolean}
*/
search(query) {
return (this.name + ' ' + this.email).toLowerCase().includes(query.toLowerCase());
}
/**
* @param {boolean} friendlyView = false
* @param {boolean} wrapWithLink = false

2
dev/View/Popup/Contacts.js
View file

@ -140,7 +140,7 @@ export class ContactsPopupView extends AbstractViewPopup {
this.contactsCheckedOrSelected().forEach(oContact => {
const data = oContact?.getNameAndEmailHelper(),
email = data ? new EmailModel(data[0], data[1]) : null;
email?.validate() && aE.push(email);
email?.valid() && aE.push(email);
});
if (arrayLength(aE)) {