diff options
author | hwc487 | 2012-03-12 14:46:32 -0700 |
---|---|---|
committer | hwc487 | 2012-03-12 14:46:32 -0700 |
commit | ef2dd5dfc557154d4755914f73963da8e858c4f1 (patch) | |
tree | b2b3e7c5b948f210b9fcc5d3dbd39ae9752938f8 /js/data/pi | |
parent | 124c1e0e4bf7a0523e641ee37352128690f15c28 (diff) | |
parent | e50077ad43f18f16de106ff6547520f73746932e (diff) | |
download | ninja-ef2dd5dfc557154d4755914f73963da8e858c4f1.tar.gz |
Merge branch 'integration' of github.com:ericmueller/ninja-internal into integration
Diffstat (limited to 'js/data/pi')
-rwxr-xr-x | js/data/pi/pi-data.js | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index c42d9082..ba03c347 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -331,10 +331,11 @@ exports.PiData = Montage.create( Montage, { | |||
331 | id: "tlRadius", | 331 | id: "tlRadius", |
332 | prop : "tlRadius", | 332 | prop : "tlRadius", |
333 | label: "TL", | 333 | label: "TL", |
334 | valueMutator: parseFloat, | ||
334 | value : 0, | 335 | value : 0, |
335 | min : 0, | 336 | min : 0, |
336 | max : 100, | 337 | max : 100, |
337 | unit : "%", | 338 | unit : "px", |
338 | acceptableUnits: ["px", "pt", "%"] | 339 | acceptableUnits: ["px", "pt", "%"] |
339 | }, | 340 | }, |
340 | { | 341 | { |
@@ -342,10 +343,12 @@ exports.PiData = Montage.create( Montage, { | |||
342 | id : "trRadius", | 343 | id : "trRadius", |
343 | prop : "trRadius", | 344 | prop : "trRadius", |
344 | label : "TR", | 345 | label : "TR", |
346 | valueMutator: parseFloat, | ||
345 | min : 0, | 347 | min : 0, |
346 | max : 100, | 348 | max : 100, |
347 | unit : "%", | 349 | unit : "px", |
348 | acceptableUnits: ["px", "pt", "%"] | 350 | acceptableUnits: ["px", "pt", "%"], |
351 | divider: true | ||
349 | } | 352 | } |
350 | ], | 353 | ], |
351 | [ | 354 | [ |
@@ -354,9 +357,10 @@ exports.PiData = Montage.create( Montage, { | |||
354 | id : "blRadius", | 357 | id : "blRadius", |
355 | prop : "blRadius", | 358 | prop : "blRadius", |
356 | label : "BL", | 359 | label : "BL", |
360 | valueMutator: parseFloat, | ||
357 | min : 0, | 361 | min : 0, |
358 | max : 100, | 362 | max : 100, |
359 | unit : "%", | 363 | unit : "px", |
360 | acceptableUnits: ["px", "pt", "%"] | 364 | acceptableUnits: ["px", "pt", "%"] |
361 | }, | 365 | }, |
362 | { | 366 | { |
@@ -364,9 +368,10 @@ exports.PiData = Montage.create( Montage, { | |||
364 | id : "brRadius", | 368 | id : "brRadius", |
365 | prop : "brRadius", | 369 | prop : "brRadius", |
366 | label : "BR", | 370 | label : "BR", |
371 | valueMutator: parseFloat, | ||
367 | min : 0, | 372 | min : 0, |
368 | max : 100, | 373 | max : 100, |
369 | unit : "%", | 374 | unit : "px", |
370 | acceptableUnits: ["px", "pt", "%"] | 375 | acceptableUnits: ["px", "pt", "%"] |
371 | } | 376 | } |
372 | ] | 377 | ] |
@@ -390,6 +395,7 @@ exports.PiData = Montage.create( Montage, { | |||
390 | { | 395 | { |
391 | type: "dropdown", | 396 | type: "dropdown", |
392 | id: "strokeMaterial", | 397 | id: "strokeMaterial", |
398 | prop: "strokeMaterial", | ||
393 | label: "Stroke", | 399 | label: "Stroke", |
394 | labelField: "_name", | 400 | labelField: "_name", |
395 | dataField: "_name", | 401 | dataField: "_name", |
@@ -402,6 +408,7 @@ exports.PiData = Montage.create( Montage, { | |||
402 | { | 408 | { |
403 | type: "dropdown", | 409 | type: "dropdown", |
404 | id: "fillMaterial", | 410 | id: "fillMaterial", |
411 | prop: "fillMaterial", | ||
405 | label: "Fill", | 412 | label: "Fill", |
406 | labelField: "_name", | 413 | labelField: "_name", |
407 | dataField: "_name", | 414 | dataField: "_name", |
@@ -524,7 +531,8 @@ exports.PiData = Montage.create( Montage, { | |||
524 | type: "hottext", | 531 | type: "hottext", |
525 | id: "innerRadius", | 532 | id: "innerRadius", |
526 | prop: "innerRadius", | 533 | prop: "innerRadius", |
527 | label: "Inner Radius", | 534 | label: "Inner R", |
535 | valueMutator: parseFloat, | ||
528 | value : 0, | 536 | value : 0, |
529 | min : 0, | 537 | min : 0, |
530 | max : 100, | 538 | max : 100, |
@@ -553,6 +561,7 @@ exports.PiData = Montage.create( Montage, { | |||
553 | { | 561 | { |
554 | type: "dropdown", | 562 | type: "dropdown", |
555 | id: "strokeMaterial", | 563 | id: "strokeMaterial", |
564 | prop: "strokeMaterial", | ||
556 | label: "Stroke", | 565 | label: "Stroke", |
557 | labelField: "_name", | 566 | labelField: "_name", |
558 | dataField: "_name", | 567 | dataField: "_name", |
@@ -565,6 +574,7 @@ exports.PiData = Montage.create( Montage, { | |||
565 | { | 574 | { |
566 | type: "dropdown", | 575 | type: "dropdown", |
567 | id: "fillMaterial", | 576 | id: "fillMaterial", |
577 | prop: "fillMaterial", | ||
568 | label: "Fill", | 578 | label: "Fill", |
569 | labelField: "_name", | 579 | labelField: "_name", |
570 | dataField: "_name", | 580 | dataField: "_name", |