archives/worldbuilding
2
0
Fork 0
mirror of https://github.com/RoY7x/worldbuilding.git synced 2025-04-30 02:31:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove usage of fromEntries

Browse source
This commit is contained in:
Andrew 2019-11-18 21:44:02 -08:00
parent fc8331c13c
commit 96b677434b
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
module/actor-sheet.js
View file

@ -118,12 +118,12 @@ export class SimpleActorSheet extends ActorSheet {
// Handle the free-form attributes list
const formAttrs = expandObject(formData).data.attributes || {};
const attributes = Object.fromEntries(Object.entries(formAttrs).map(attr => {
let [k, v] = attr;
k = v["key"].trim();
const attributes = Object.values(formAttrs).reduce((obj, v) => {
let k = v["key"].trim();
delete v["key"];
return [k, v];
}));
obj[k] = v;
return obj;
}, {});
// Remove attributes which are no longer used
for ( let k of Object.keys(this.object.data.data.attributes) ) {
@ -131,9 +131,10 @@ export class SimpleActorSheet extends ActorSheet {
}
// Re-combine formData
formData = Object.fromEntries(Object.entries(formData).filter(a => !a[0].startsWith("data.attributes")));
formData["_id"] = this.object._id;
formData["data.attributes"] = attributes;
formData = Object.entries(formData).filter(e => !e[0].startsWith("data.attributes")).reduce((obj, e) => {
obj[e[0]] = e[1];
return obj;
}, {_id: this.object._id, "data.attributes": attributes});
// Update the Actor
return this.object.update(formData);

19
module/item-sheet.js
View file

@ -102,12 +102,12 @@ export class SimpleItemSheet extends ItemSheet {
// Handle the free-form attributes list
const formAttrs = expandObject(formData).data.attributes || {};
const attributes = Object.fromEntries(Object.entries(formAttrs).map(attr => {
let [k, v] = attr;
k = v["key"].trim();
const attributes = Object.values(formAttrs).reduce((obj, v) => {
let k = v["key"].trim();
delete v["key"];
return [k, v];
}));
obj[k] = v;
return obj;
}, {});
// Remove attributes which are no longer used
for ( let k of Object.keys(this.object.data.data.attributes) ) {
@ -115,10 +115,11 @@ export class SimpleItemSheet extends ItemSheet {
}
// Re-combine formData
formData = Object.fromEntries(Object.entries(formData).filter(a => !a[0].startsWith("data.attributes")));
formData["_id"] = this.object._id;
formData["data.attributes"] = attributes;
formData = Object.entries(formData).filter(e => !e[0].startsWith("data.attributes")).reduce((obj, e) => {
obj[e[0]] = e[1];
return obj;
}, {_id: this.object._id, "data.attributes": attributes});
// Update the Item
return this.object.update(formData);
}