diff options
author | Pushkar Joshi | 2012-04-17 14:49:18 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-17 14:49:18 -0700 |
commit | df903a01e14134cadf109b733d09c6eadfa3966b (patch) | |
tree | 2351f1c05b2f852053fa0be533072088a9ad4e7c /js/data/pi | |
parent | 036cf034e124dbc1f4893e90f7c6d240904a3faf (diff) | |
parent | cacb4a21825818af392c2949967b0f3c1df509c5 (diff) | |
download | ninja-df903a01e14134cadf109b733d09c6eadfa3966b.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
Diffstat (limited to 'js/data/pi')
-rwxr-xr-x | js/data/pi/pi-data.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 7edc90d8..157c54ec 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -131,6 +131,8 @@ exports.PiData = Montage.create( Montage, { | |||
131 | type : "hottext", | 131 | type : "hottext", |
132 | id : "borderWidth", | 132 | id : "borderWidth", |
133 | prop : "border-width", | 133 | prop : "border-width", |
134 | defaultValue: 0, | ||
135 | valueMutator: parseFloat, | ||
134 | label : "Border", | 136 | label : "Border", |
135 | min : 0, | 137 | min : 0, |
136 | max : 100, | 138 | max : 100, |
@@ -578,7 +580,7 @@ exports.PiData = Montage.create( Montage, { | |||
578 | valueMutator: parseFloat, | 580 | valueMutator: parseFloat, |
579 | value : 0, | 581 | value : 0, |
580 | min : 0, | 582 | min : 0, |
581 | max : 100, | 583 | max : 99, |
582 | unit : "%", | 584 | unit : "%", |
583 | acceptableUnits: ["%"] | 585 | acceptableUnits: ["%"] |
584 | 586 | ||