diff options
author | Valerio Virgillito | 2012-02-08 10:18:36 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-08 10:18:36 -0800 |
commit | 763910b9d074137eb7dee80447b89407ce5750c9 (patch) | |
tree | 3c8820a06afd442fa5ba8e68665a4d2836230628 /js/panels/properties | |
parent | e5579374ff39b80b8c0c69faba37f6f581758fe0 (diff) | |
parent | 329a859e2666716c3a1d99c6bd2679e10c81fc8d (diff) | |
download | ninja-763910b9d074137eb7dee80447b89407ce5750c9.tar.gz |
Merge pull request #20 from mqg734/ToolFixes
Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
Diffstat (limited to 'js/panels/properties')
-rw-r--r-- | js/panels/properties/sections/custom.reel/custom.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/js/panels/properties/sections/custom.reel/custom.js b/js/panels/properties/sections/custom.reel/custom.js index 2b5b522a..992db8e6 100644 --- a/js/panels/properties/sections/custom.reel/custom.js +++ b/js/panels/properties/sections/custom.reel/custom.js | |||
@@ -186,6 +186,8 @@ exports.CustomSection = Montage.create(Component, { | |||
186 | if (aField.value) obj.value = aField.value; | 186 | if (aField.value) obj.value = aField.value; |
187 | if (aField.labelField) obj.labelField = aField.labelField; | 187 | if (aField.labelField) obj.labelField = aField.labelField; |
188 | if (aField.labelFunction) obj.labelFunction = aField.labelFunction; | 188 | if (aField.labelFunction) obj.labelFunction = aField.labelFunction; |
189 | if (aField.dataField) obj.dataField = aField.dataField; | ||
190 | if (aField.dataFunction) obj.dataFunction = aField.dataFunction; | ||
189 | if (aField.items) { | 191 | if (aField.items) { |
190 | if(aField.items.boundObject) { | 192 | if(aField.items.boundObject) { |
191 | obj.items = eval(aField.items.boundObject)[aField.items.boundProperty]; | 193 | obj.items = eval(aField.items.boundObject)[aField.items.boundProperty]; |
@@ -193,6 +195,18 @@ exports.CustomSection = Montage.create(Component, { | |||
193 | obj.items = aField.items; | 195 | obj.items = aField.items; |
194 | } | 196 | } |
195 | } | 197 | } |
198 | if (aField.enabled) { | ||
199 | if(aField.enabled.boundObject) { | ||
200 | // TODO - For now, always bind to this.controls[someProperty] | ||
201 | Object.defineBinding(obj, "enabled", { | ||
202 | boundObject: this.controls, | ||
203 | boundObjectPropertyPath: aField.enabled.boundProperty, | ||
204 | oneway: false | ||
205 | }); | ||
206 | } else { | ||
207 | obj.enabled = aField.enabled; | ||
208 | } | ||
209 | } | ||
196 | 210 | ||
197 | obj.addEventListener("change", this, false); | 211 | obj.addEventListener("change", this, false); |
198 | // | 212 | // |