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

merge all Model JSON @Object parsers into a reviveFromJson()

Browse source
This commit is contained in:
djmaze 2020-10-18 19:46:47 +02:00
parent 76648f04ae
commit 15e07a73e9
18 changed files with 378 additions and 411 deletions
Download patch file Download diff file Expand all files Collapse all files

40
dev/Model/Email.js
View file

@ -1,5 +1,7 @@
import { encodeHtml } from 'Common/UtilsUser';
import { AbstractModel } from 'Knoin/AbstractModel';
'use strict';
/**
@ -258,7 +260,7 @@ class Tokenizer
}
}
class EmailModel {
class EmailModel extends AbstractModel {
email = '';
name = '';
dkimStatus = '';
@ -271,6 +273,7 @@ class EmailModel {
* @param {string=} dkimValue = ''
*/
constructor(email = '', name = '', dkimStatus = 'none', dkimValue = '') {
super();
this.email = email;
this.name = name;
this.dkimStatus = dkimStatus;
@ -281,12 +284,20 @@ class EmailModel {
/**
* @static
* @param {AjaxJsonEmail} json
* @param {FetchJsonEmail} json
* @returns {?EmailModel}
*/
static newInstanceFromJson(json) {
const email = new EmailModel();
return email.initByJson(json) ? email : null;
static reviveFromJson(json) {
const email = super.reviveFromJson(json);
if (email && email.email) {
email.name = json.Name.trim();
email.email = json.Email.trim();
email.dkimStatus = (json.DkimStatus || '').trim();
email.dkimValue = (json.DkimValue || '').trim();
email.clearDuplicateName();
return email;
}
return null;
}
/**
@ -332,25 +343,6 @@ class EmailModel {
return (this.name + ' ' + this.email).toLowerCase().includes(query.toLowerCase());
}
/**
* @param {AjaxJsonEmail} oJsonEmail
* @returns {boolean}
*/
initByJson(json) {
let result = false;
if (json && 'Object/Email' === json['@Object']) {
this.name = json.Name.trim();
this.email = json.Email.trim();
this.dkimStatus = (json.DkimStatus || '').trim();
this.dkimValue = (json.DkimValue || '').trim();
result = !!this.email;
this.clearDuplicateName();
}
return result;
}
/**
* @param {boolean} friendlyView = false
* @param {boolean=} wrapWithLink = false