diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/data | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/data')
-rwxr-xr-x | js/data/pi/pi-data.js | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 92d70141..e3e1de15 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -52,8 +52,8 @@ exports.PiData = Montage.create( Montage, { | |||
52 | type : "hottext", | 52 | type : "hottext", |
53 | id : "borderWidth", | 53 | id : "borderWidth", |
54 | prop : "border-width", | 54 | prop : "border-width", |
55 | defaultValue: 0, | 55 | defaultValue: "0 px", |
56 | valueMutator: parseFloat, | 56 | inputFunction: parseFloat, |
57 | label : "Border", | 57 | label : "Border", |
58 | min : 0, | 58 | min : 0, |
59 | max : 100, | 59 | max : 100, |
@@ -131,8 +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, | 134 | defaultValue: "0 px", |
135 | valueMutator: parseFloat, | 135 | inputFunction: parseFloat, |
136 | label : "Border", | 136 | label : "Border", |
137 | min : 0, | 137 | min : 0, |
138 | max : 100, | 138 | max : 100, |
@@ -254,8 +254,8 @@ exports.PiData = Montage.create( Montage, { | |||
254 | type : "hottext", | 254 | type : "hottext", |
255 | id : "borderWidth", | 255 | id : "borderWidth", |
256 | prop : "border-width", | 256 | prop : "border-width", |
257 | defaultValue: 0, | 257 | defaultValue: "0 px", |
258 | valueMutator: parseFloat, | 258 | inputFunction: parseFloat, |
259 | label : "Border", | 259 | label : "Border", |
260 | min : 0, | 260 | min : 0, |
261 | max : 100, | 261 | max : 100, |
@@ -313,7 +313,7 @@ exports.PiData = Montage.create( Montage, { | |||
313 | id : "strokeSize", | 313 | id : "strokeSize", |
314 | prop : "strokeSize", | 314 | prop : "strokeSize", |
315 | label : "Stroke", | 315 | label : "Stroke", |
316 | valueMutator: parseFloat, | 316 | inputFunction: parseFloat, |
317 | min : 0, | 317 | min : 0, |
318 | max : 100, | 318 | max : 100, |
319 | value : 1, | 319 | value : 1, |
@@ -333,23 +333,23 @@ exports.PiData = Montage.create( Montage, { | |||
333 | id: "tlRadius", | 333 | id: "tlRadius", |
334 | prop : "tlRadius", | 334 | prop : "tlRadius", |
335 | label: "TL", | 335 | label: "TL", |
336 | valueMutator: parseFloat, | 336 | inputFunction: parseFloat, |
337 | value : 0, | 337 | value : 0, |
338 | min : 0, | 338 | min : 0, |
339 | max : 100, | 339 | max : 1000, |
340 | unit : "px", | 340 | acceptableUnits: ["px", "pt", "%"], |
341 | acceptableUnits: ["px", "pt", "%"] | 341 | unit : "px" |
342 | }, | 342 | }, |
343 | { | 343 | { |
344 | type : "hottext", | 344 | type : "hottext", |
345 | id : "trRadius", | 345 | id : "trRadius", |
346 | prop : "trRadius", | 346 | prop : "trRadius", |
347 | label : "TR", | 347 | label : "TR", |
348 | valueMutator: parseFloat, | 348 | inputFunction: parseFloat, |
349 | min : 0, | 349 | min : 0, |
350 | max : 100, | 350 | max : 1000, |
351 | unit : "px", | ||
352 | acceptableUnits: ["px", "pt", "%"], | 351 | acceptableUnits: ["px", "pt", "%"], |
352 | unit : "px", | ||
353 | divider: true | 353 | divider: true |
354 | } | 354 | } |
355 | ], | 355 | ], |
@@ -359,22 +359,22 @@ exports.PiData = Montage.create( Montage, { | |||
359 | id : "blRadius", | 359 | id : "blRadius", |
360 | prop : "blRadius", | 360 | prop : "blRadius", |
361 | label : "BL", | 361 | label : "BL", |
362 | valueMutator: parseFloat, | 362 | inputFunction: parseFloat, |
363 | min : 0, | 363 | min : 0, |
364 | max : 100, | 364 | max : 1000, |
365 | unit : "px", | 365 | acceptableUnits: ["px", "pt", "%"], |
366 | acceptableUnits: ["px", "pt", "%"] | 366 | unit : "px" |
367 | }, | 367 | }, |
368 | { | 368 | { |
369 | type : "hottext", | 369 | type : "hottext", |
370 | id : "brRadius", | 370 | id : "brRadius", |
371 | prop : "brRadius", | 371 | prop : "brRadius", |
372 | label : "BR", | 372 | label : "BR", |
373 | valueMutator: parseFloat, | 373 | inputFunction: parseFloat, |
374 | min : 0, | 374 | min : 0, |
375 | max : 100, | 375 | max : 1000, |
376 | unit : "px", | 376 | acceptableUnits: ["px", "pt", "%"], |
377 | acceptableUnits: ["px", "pt", "%"] | 377 | unit : "px" |
378 | } | 378 | } |
379 | ] | 379 | ] |
380 | ] | 380 | ] |
@@ -473,7 +473,7 @@ exports.PiData = Montage.create( Montage, { | |||
473 | id : "strokeSize", | 473 | id : "strokeSize", |
474 | prop : "strokeSize", | 474 | prop : "strokeSize", |
475 | label : "Stroke", | 475 | label : "Stroke", |
476 | valueMutator: parseFloat, | 476 | inputFunction: parseFloat, |
477 | min : 0, | 477 | min : 0, |
478 | max : 100, | 478 | max : 100, |
479 | value : 1, | 479 | value : 1, |
@@ -557,7 +557,7 @@ exports.PiData = Montage.create( Montage, { | |||
557 | id : "strokeSize", | 557 | id : "strokeSize", |
558 | prop : "strokeSize", | 558 | prop : "strokeSize", |
559 | label : "Stroke", | 559 | label : "Stroke", |
560 | valueMutator: parseFloat, | 560 | inputFunction: parseFloat, |
561 | min : 0, | 561 | min : 0, |
562 | max : 100, | 562 | max : 100, |
563 | value : 1, | 563 | value : 1, |
@@ -577,7 +577,7 @@ exports.PiData = Montage.create( Montage, { | |||
577 | id: "innerRadius", | 577 | id: "innerRadius", |
578 | prop: "innerRadius", | 578 | prop: "innerRadius", |
579 | label: "Inner R", | 579 | label: "Inner R", |
580 | valueMutator: parseFloat, | 580 | inputFunction: parseFloat, |
581 | value : 0, | 581 | value : 0, |
582 | min : 0, | 582 | min : 0, |
583 | max : 99, | 583 | max : 99, |
@@ -681,7 +681,7 @@ exports.PiData = Montage.create( Montage, { | |||
681 | id : "strokeSize", | 681 | id : "strokeSize", |
682 | prop : "strokeSize", | 682 | prop : "strokeSize", |
683 | label : "Stroke", | 683 | label : "Stroke", |
684 | valueMutator: parseFloat, | 684 | inputFunction: parseFloat, |
685 | min : 1, | 685 | min : 1, |
686 | max : 100, | 686 | max : 100, |
687 | value : 1, | 687 | value : 1, |
@@ -720,7 +720,7 @@ exports.PiData = Montage.create( Montage, { | |||
720 | id : "strokeSize", | 720 | id : "strokeSize", |
721 | prop : "strokeSize", | 721 | prop : "strokeSize", |
722 | label : "Stroke", | 722 | label : "Stroke", |
723 | valueMutator: parseInt, | 723 | inputFunction: parseInt, |
724 | min : 1, | 724 | min : 1, |
725 | max : 100, | 725 | max : 100, |
726 | value : 1, | 726 | value : 1, |
@@ -732,7 +732,7 @@ exports.PiData = Montage.create( Montage, { | |||
732 | id : "strokeHardness", | 732 | id : "strokeHardness", |
733 | prop : "strokeHardness", | 733 | prop : "strokeHardness", |
734 | label : "Hardness", | 734 | label : "Hardness", |
735 | valueMutator: parseInt, | 735 | inputFunction: parseInt, |
736 | min : 0, | 736 | min : 0, |
737 | max : 100, | 737 | max : 100, |
738 | value : 100, | 738 | value : 100, |
@@ -759,7 +759,7 @@ exports.PiData = Montage.create( Montage, { | |||
759 | id : "strokeSmoothing", | 759 | id : "strokeSmoothing", |
760 | prop : "strokeSmoothing", | 760 | prop : "strokeSmoothing", |
761 | label : "Amount", | 761 | label : "Amount", |
762 | valueMutator: parseFloat, | 762 | inputFunction: parseFloat, |
763 | min : 0, | 763 | min : 0, |
764 | max : 100, | 764 | max : 100, |
765 | value : 0, | 765 | value : 0, |
@@ -787,7 +787,7 @@ exports.PiData = Montage.create( Montage, { | |||
787 | id : "strokeAngle", | 787 | id : "strokeAngle", |
788 | prop : "strokeAngle", | 788 | prop : "strokeAngle", |
789 | label : "Angle", | 789 | label : "Angle", |
790 | valueMutator: parseFloat, | 790 | inputFunction: parseFloat, |
791 | min : -90, | 791 | min : -90, |
792 | max : 90, | 792 | max : 90, |
793 | value : 0, | 793 | value : 0, |