aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-22 22:26:51 -0700
committerValerio Virgillito2012-03-22 22:26:51 -0700
commit388d8e469e4641553b67aece4fc1d56d9789fff5 (patch)
treed5b75fc0cfb47a714ba240dabbd48def1c6993f4 /js/data/pi
parentf6afc520f357dec8daeb9b9e748f99c8d8508f7c (diff)
parentf2371c4a5a18a4dadb2e76f0275b90ac541e889d (diff)
downloadninja-388d8e469e4641553b67aece4fc1d56d9789fff5.tar.gz
Merge pull request #134 from mqg734/WebGL-Animation-CheckBox
Adding enabled/disabled support for PI"s checkbox controls, and using that capability for WebGL animate checkbox.
Diffstat (limited to 'js/data/pi')
-rwxr-xr-xjs/data/pi/pi-data.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 56337124..52360302 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -398,7 +398,8 @@ exports.PiData = Montage.create( Montage, {
398 prop: "animate", 398 prop: "animate",
399 defaultValue: true, 399 defaultValue: true,
400 value: "Animate", 400 value: "Animate",
401 checked: true 401 checked: true,
402 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
402 } 403 }
403 ], 404 ],
404 [ 405 [
@@ -501,7 +502,8 @@ exports.PiData = Montage.create( Montage, {
501 prop: "animate", 502 prop: "animate",
502 defaultValue: true, 503 defaultValue: true,
503 value: "Animate", 504 value: "Animate",
504 checked: true 505 checked: true,
506 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
505 } 507 }
506 ], 508 ],
507 [ 509 [
@@ -605,7 +607,8 @@ exports.PiData = Montage.create( Montage, {
605 prop: "animate", 607 prop: "animate",
606 defaultValue: true, 608 defaultValue: true,
607 value: "Animate", 609 value: "Animate",
608 checked: true 610 checked: true,
611 enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
609 } 612 }
610 ], 613 ],
611 [ 614 [