VSinerva/freesewing
1
0
Fork 0
Code Activity

🐛 Fixed issue where pattern.mergeSettings() wouldn't handle array correctly

Browse source
This commit is contained in:
Joost De Cock 2018-12-16 18:43:57 +01:00
parent 6503108e20
commit 63d07c09ad
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pattern.js
View file

@ -81,7 +81,11 @@ Pattern.prototype.createPart = function() {
// Merges settings object with this.settings
Pattern.prototype.mergeSettings = function(settings) {
for (let key of Object.keys(settings)) {
if (typeof settings[key] === "object") {
if (Array.isArray(settings[key])) {
if (Array.isArray(this.settings[key])) {
for (let entry of settings[key]) this.settings[key].push(entry);
} else this.settings[key] = settings[key];
} else if (typeof settings[key] === "object") {
this.settings[key] = {
...this.settings[key],
...settings[key]