tongChong
/
css-doodle
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

compose cond arguments correctly

This commit is contained in:
yuanchuan 2017-05-28 21:58:43 +08:00
parent 5a7fb544c7
commit d75c0bd092
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css-doodle.js
View File

@ -153,7 +153,7 @@ function circle() {
}
function siogon(sides) {
return polygon(minmax(sides, 3, 24));
return polygon(minmax(sides, 3, 12));
}
function triangle() {
@ -411,7 +411,10 @@ class Rules {
case 'cond':
var fn = cond[token.name.substr(1)];
if (fn) {
var result = apply_args(fn, coords, token.arguments);
var args = token.arguments.map(arg => {
return this.compose_argument(arg, coords);
});
var result = apply_args(fn, coords, args);
if (result) {
this.compose(coords, token.styles);
}

2
css-doodle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/lib/css-doodle.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
src/generator.js
View File

@ -115,7 +115,10 @@ class Rules {
case 'cond':
var fn = cond[token.name.substr(1)];
if (fn) {
var result = utils.apply_args(fn, coords, token.arguments);
var args = token.arguments.map(arg => {
return this.compose_argument(arg, coords);
});
var result = utils.apply_args(fn, coords, args);
if (result) {
this.compose(coords, token.styles);
}