aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom.reel
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/panels/properties.reel/sections/custom.reel
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/panels/properties.reel/sections/custom.reel')
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index 703ef950..ac316907 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -328,6 +328,19 @@ exports.CustomSection = Montage.create(Component, {
328 if (aField.value) obj.label = aField.value; 328 if (aField.value) obj.label = aField.value;
329 if (aField.prop) obj.prop = aField.prop; 329 if (aField.prop) obj.prop = aField.prop;
330 330
331 if (aField.enabled) {
332 if(aField.enabled.boundObject) {
333 // TODO - For now, always bind to this.controls[someProperty]
334 Object.defineBinding(obj, "enabled", {
335 boundObject: this.controls,
336 boundObjectPropertyPath: aField.enabled.boundProperty,
337 oneway: false
338 });
339 } else {
340 obj.enabled = aField.enabled;
341 }
342 }
343
331 //Initiate onChange Events 344 //Initiate onChange Events
332 obj.addEventListener("change", this, false); 345 obj.addEventListener("change", this, false);
333 346