VSinerva/freesewing
1
0
Fork 0
Code Activity

boom: pattern.mergeSettings() is now pattern.apply()

Browse source
This commit is contained in:
Joost De Cock 2018-12-22 11:47:02 +01:00
parent c74baff032
commit 48b841995e
5 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/cathrin/config/config.js
View file

@ -1,5 +1,8 @@
import { version } from "../package.json";
export default { export default {
name: "cathrin", name: "cathrin",
version,
measurements: [ measurements: [
"underbust", "underbust",
"naturalWaist", "naturalWaist",

12
packages/cathrin/index.html
View file

@ -18,13 +18,13 @@
<script type="text/javascript" src="node_modules/@freesewing/models/dist/browser.js"></script> <script type="text/javascript" src="node_modules/@freesewing/models/dist/browser.js"></script>
<script type="text/javascript" src="node_modules/@freesewing/antman/dist/browser.js"></script> <script type="text/javascript" src="node_modules/@freesewing/antman/dist/browser.js"></script>
<script> <script>
var pattern = new freesewing.patterns.cathrin; var pattern = new freesewing.patterns.cathrin();
pattern pattern
.with(freesewing.plugins.debug) .use(freesewing.plugins.debug)
.with(freesewing.plugins.theme) .use(freesewing.plugins.theme)
.with(freesewing.plugins.designer) .use(freesewing.plugins.designer)
.with(freesewing.plugins.validate) .use(freesewing.plugins.validate)
.with(freesewing.plugins.i18n) .use(freesewing.plugins.i18n)
; ;
pattern.settings.locale = 'nl'; pattern.settings.locale = 'nl';
pattern.settings.paperless = true; pattern.settings.paperless = true;

18
packages/cathrin/package-lock.json generated
View file

@ -923,14 +923,15 @@
"dev": true "dev": true
}, },
"@freesewing/plugin-bundle": { "@freesewing/plugin-bundle": {
"version": "0.5.1", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/@freesewing/plugin-bundle/-/plugin-bundle-0.5.1.tgz", "resolved": "https://registry.npmjs.org/@freesewing/plugin-bundle/-/plugin-bundle-0.6.0.tgz",
"integrity": "sha512-43dF2OkLE6ZxFwK5aLElX/6ejQl4tgLhMFlYO7igqLRjaEufC3Q9mAIR+AyuzyUzDkDdgGdefqTdmOjTdO4PTg==", "integrity": "sha512-gytm7G6CQtgi7wAxXe2ib8vwqak8DpMhR7v++fX418EgR16WBgxTVdglqLVQ8j/qF+W7QRbcS+jomCfU7FLxXQ==",
"requires": { "requires": {
"@freesewing/plugin-cutonfold": "0.10.2", "@freesewing/plugin-cutonfold": "0.10.2",
"@freesewing/plugin-dimension": "0.7.3", "@freesewing/plugin-dimension": "0.7.3",
"@freesewing/plugin-grainline": "0.2.2", "@freesewing/plugin-grainline": "0.2.2",
"@freesewing/plugin-logo": "0.5.2", "@freesewing/plugin-logo": "0.5.2",
"@freesewing/plugin-round": "0.2.0",
"@freesewing/plugin-scalebox": "0.3.1", "@freesewing/plugin-scalebox": "0.3.1",
"@freesewing/plugin-title": "0.9.1" "@freesewing/plugin-title": "0.9.1"
} }
@ -973,6 +974,11 @@
"resolved": "https://registry.npmjs.org/@freesewing/plugin-logo/-/plugin-logo-0.5.2.tgz", "resolved": "https://registry.npmjs.org/@freesewing/plugin-logo/-/plugin-logo-0.5.2.tgz",
"integrity": "sha512-g+lk/nBYxnzs7hQYUdQ/YDPJCUmUeZcNdk0+xUWoADdoZY95NwrXVxfNz/O2wI9kRCgFpFojgT0dD2HKtkv0/w==" "integrity": "sha512-g+lk/nBYxnzs7hQYUdQ/YDPJCUmUeZcNdk0+xUWoADdoZY95NwrXVxfNz/O2wI9kRCgFpFojgT0dD2HKtkv0/w=="
}, },
"@freesewing/plugin-round": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/@freesewing/plugin-round/-/plugin-round-0.2.0.tgz",
"integrity": "sha512-uzAxICxNHQ0rtS4W07mhQQ0qcm4nHWNUzkInK/322k7BCYYb/v8tsC2EW9PISCvHZqUEhlDBR+vXPsusNSRNhA=="
},
"@freesewing/plugin-scalebox": { "@freesewing/plugin-scalebox": {
"version": "0.3.1", "version": "0.3.1",
"resolved": "https://registry.npmjs.org/@freesewing/plugin-scalebox/-/plugin-scalebox-0.3.1.tgz", "resolved": "https://registry.npmjs.org/@freesewing/plugin-scalebox/-/plugin-scalebox-0.3.1.tgz",
@ -2750,9 +2756,9 @@
} }
}, },
"freesewing": { "freesewing": {
"version": "0.23.2", "version": "0.26.1",
"resolved": "https://registry.npmjs.org/freesewing/-/freesewing-0.23.2.tgz", "resolved": "https://registry.npmjs.org/freesewing/-/freesewing-0.26.1.tgz",
"integrity": "sha512-6EWJnr/X6lsyCkN4NJK1KAP6TTI4YF7NIaAP0eATOebAU87FENqBaHLH8x+PoY/0BcekprGIen/hhQelUOLc5g==", "integrity": "sha512-j6y7JuM+n3vyKwBPkEYOjpXc4QoU0cBcHDQTaWBi/YXITrIvi2zYcbTW6xwGnQcohBjNDb3feqZSgGhf4dB/xw==",
"requires": { "requires": {
"bezier-js": "^2.2.15", "bezier-js": "^2.2.15",
"bin-pack": "1.0.2" "bin-pack": "1.0.2"

4
packages/cathrin/package.json
View file

@ -47,8 +47,8 @@
] ]
}, },
"dependencies": { "dependencies": {
"freesewing": "^0.23.2", "freesewing": "^0.26.1",
"@freesewing/plugin-bundle": "^0.5.1" "@freesewing/plugin-bundle": "^0.6.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.0.0-beta.56", "@babel/core": "7.0.0-beta.56",

16
packages/cathrin/src/index.js
View file

@ -1,7 +1,6 @@
import freesewing from "freesewing"; import freesewing from "freesewing";
import pluginBundle from "@freesewing/plugin-bundle"; import plugins from "@freesewing/plugin-bundle";
import config from "../config/config"; import config from "../config/config";
import { version } from "../package.json";
//Parts //Parts
import draftBase from "./base"; import draftBase from "./base";
import draftPanels from "./panels"; import draftPanels from "./panels";
@ -12,16 +11,17 @@ import draftPanel4 from "./panel4";
import draftPanel5 from "./panel5"; import draftPanel5 from "./panel5";
import draftPanel6 from "./panel6"; import draftPanel6 from "./panel6";
// Constructor boilerplate // Constructor
const Cathrin = function(settings = false) { const Cathrin = function(settings) {
freesewing.Pattern.call(this, { version: version, ...config }); freesewing.Pattern.call(this, config);
this.with(pluginBundle); this
if (settings !== false) this.mergeSettings(settings); .use(plugins)
.apply(settings);
return this; return this;
}; };
// Inheritance boilerplate // Set up inheritance
Cathrin.prototype = Object.create(freesewing.Pattern.prototype); Cathrin.prototype = Object.create(freesewing.Pattern.prototype);
Cathrin.prototype.constructor = Cathrin; Cathrin.prototype.constructor = Cathrin;