VSinerva/freesewing
1
0
Fork 0
Code Activity

💥 pattern.mergeSettings() is now pattern.appy()

Browse source
This commit is contained in:
Joost De Cock 2018-12-22 11:14:42 +01:00
parent 6ad8cb6cb0
commit 1d29b12953
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pattern.js
View file

@ -87,7 +87,7 @@ export default function Pattern(config = { options: {} }) {
} }
// Merges settings object with this.settings // Merges settings object with this.settings
Pattern.prototype.mergeSettings = function(settings) { Pattern.prototype.apply = function(settings) {
for (let key of Object.keys(settings)) { for (let key of Object.keys(settings)) {
if (Array.isArray(settings[key])) { if (Array.isArray(settings[key])) {
if (Array.isArray(this.settings[key])) { if (Array.isArray(this.settings[key])) {
@ -100,6 +100,8 @@ Pattern.prototype.mergeSettings = function(settings) {
}; };
} else this.settings[key] = settings[key]; } else this.settings[key] = settings[key];
} }
return this;
}; };
Pattern.prototype.runHooks = function(hookName, data = false) { Pattern.prototype.runHooks = function(hookName, data = false) {

8
tests/pattern.test.js
View file

@ -83,7 +83,7 @@ it("Should merge settings with default settings", () => {
free: "ze" free: "ze"
} }
}; };
pattern.mergeSettings(settings); pattern.apply(settings);
expect(pattern.settings.foo).to.equal("bar"); expect(pattern.settings.foo).to.equal("bar");
expect(pattern.settings.locale).to.equal("en"); expect(pattern.settings.locale).to.equal("en");
expect(pattern.settings.margin).to.equal(2); expect(pattern.settings.margin).to.equal(2);
@ -197,7 +197,7 @@ it("Should sample models", () => {
}; };
const Test = function(settings) { const Test = function(settings) {
freesewing.Pattern.call(this, config); freesewing.Pattern.call(this, config);
this.mergeSettings(settings); this.apply(settings);
return this; return this;
}; };
Test.prototype = Object.create(freesewing.Pattern.prototype); Test.prototype = Object.create(freesewing.Pattern.prototype);
@ -387,7 +387,7 @@ it("Should correctly merge settings", () => {
only: [1, 2, 3], only: [1, 2, 3],
margin: 5 margin: 5
}; };
pattern.mergeSettings(settings); pattern.apply(settings);
expect(pattern.settings.complete).to.equal(false); expect(pattern.settings.complete).to.equal(false);
expect(pattern.settings.only[1]).to.equal(2); expect(pattern.settings.only[1]).to.equal(2);
expect(pattern.settings.margin).to.equal(5); expect(pattern.settings.margin).to.equal(5);
@ -402,7 +402,7 @@ it("Should correctly merge settings for existing array", () => {
only: [2, 3, 4], only: [2, 3, 4],
margin: 5 margin: 5
}; };
pattern.mergeSettings(settings); pattern.apply(settings);
expect(pattern.settings.complete).to.equal(false); expect(pattern.settings.complete).to.equal(false);
expect(pattern.settings.only.length).to.equal(4); expect(pattern.settings.only.length).to.equal(4);
expect(pattern.settings.margin).to.equal(5); expect(pattern.settings.margin).to.equal(5);