diff options
author | Eric Guzman | 2012-03-27 10:22:42 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-27 10:22:42 -0700 |
commit | 309b201017da2a4094df4f06adeeff9d396b193a (patch) | |
tree | 92257b32855bcd31dd74967b085a6632fd7dbe9b /js/panels/properties.reel/sections/custom.reel/custom.js | |
parent | da03585a0b03220281f6d54d9acf0ae0fafaef16 (diff) | |
parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
download | ninja-309b201017da2a4094df4f06adeeff9d396b193a.tar.gz |
Merge branch 'refs/heads/master' into PresetsPI
Diffstat (limited to 'js/panels/properties.reel/sections/custom.reel/custom.js')
-rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 13 |
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 | ||