aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties/sections/custom.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-13 11:59:19 -0800
committerArmen Kesablyan2012-02-13 11:59:19 -0800
commit90d0c8c0e98d062c628c061fe5765ce991fda409 (patch)
tree9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /js/panels/properties/sections/custom.reel
parent8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff)
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts: css/ninja.css js/stage/stage.reel/stage.html js/tools/TextTool.js node_modules/labs/rich-text-editor.reel/rich-text-editor.css node_modules/labs/rich-text-editor.reel/rich-text-editor.html node_modules/labs/rich-text-editor.reel/rich-text-editor.js node_modules/labs/rich-text-editor.reel/rich-text-resizer.js node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/properties/sections/custom.reel')
-rw-r--r--js/panels/properties/sections/custom.reel/custom.js14
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//