Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-10-07 19:57:56 +08:00
Code Issues Projects Releases Packages Wiki Activity

Allow Attribute.Collection to have unspecified / basic type e.g. string

Browse source
This commit is contained in:
Ben Gotow 2017-07-07 15:57:29 -07:00
parent 6b070aa9dc
commit 1a36bec6fc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/client-app/src/flux/attributes/attribute-collection.es6
View file

@ -47,7 +47,7 @@ export default class AttributeCollection extends Attribute {
} }
return vals.map((val) => { return vals.map((val) => {
if (!(val instanceof this.ItemClass)) { if (this.ItemClass && !(val instanceof this.ItemClass)) {
throw new Error(`AttributeCollection::toJSON: Value \`${val}\` in ${this.modelKey} is not an ${this.ItemClass.name}`); throw new Error(`AttributeCollection::toJSON: Value \`${val}\` in ${this.modelKey} is not an ${this.ItemClass.name}`);
} }
return (val.toJSON !== undefined) ? val.toJSON() : val; return (val.toJSON !== undefined) ? val.toJSON() : val;
@ -59,7 +59,7 @@ export default class AttributeCollection extends Attribute {
return []; return [];
} }
return json.map((objJSON) => { return json.map((objJSON) => {
if (!objJSON || objJSON instanceof this.ItemClass) { if (!objJSON || !this.ItemClass || objJSON instanceof this.ItemClass) {
return objJSON; return objJSON;
} }
return new this.ItemClass(objJSON); return new this.ItemClass(objJSON);