aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-11 17:46:29 -0700
committerValerio Virgillito2012-06-11 17:46:29 -0700
commitb6c88f548c8d3756738e534418732710af733f03 (patch)
treed651ce2811019a3bccfd8be1326762cd2c601316 /js/data/pi
parent91123fef348ec54d89005adbc151e816856a6a18 (diff)
parent6854a72504f57903bd5de003e377f2aefb02d0da (diff)
downloadninja-b6c88f548c8d3756738e534418732710af733f03.tar.gz
Merge branch 'refs/heads/master' into montage-v10-integration
Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/data/pi')
-rwxr-xr-xjs/data/pi/pi-data.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 157cbc64..92d70141 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -703,13 +703,14 @@ exports.PiData = Montage.create( Montage, {
703 { 703 {
704 type : "color", 704 type : "color",
705 prop: "border", 705 prop: "border",
706 id : "stroke" 706 id : "stroke",
707 visible: false
707 }, 708 },
708 { 709 {
709 type : "color", 710 type : "color",
710 id : "fill", 711 id : "fill",
711 prop: "background", 712 prop: "background",
712 visible : false, 713 visible : true,
713 divider : true 714 divider : true
714 } 715 }
715 ], 716 ],
@@ -761,7 +762,9 @@ exports.PiData = Montage.create( Montage, {
761 valueMutator: parseFloat, 762 valueMutator: parseFloat,
762 min : 0, 763 min : 0,
763 max : 100, 764 max : 100,
764 value : 0 765 value : 0,
766 acceptableUnits: [" "],
767 unit: " "
765 } 768 }
766 ] 769 ]
767 ] 770 ]
@@ -788,6 +791,7 @@ exports.PiData = Montage.create( Montage, {
788 min : -90, 791 min : -90,
789 max : 90, 792 max : 90,
790 value : 0, 793 value : 0,
794 acceptableUnits: ["deg."],
791 unit : "deg." 795 unit : "deg."
792 } 796 }
793 ] 797 ]