aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-02 20:33:31 -0700
committerArmen Kesablyan2012-06-02 20:33:31 -0700
commit6ac505c3fc2b4be7628b9df339ab9f64de700c8b (patch)
tree1ad5f9d03d13d287f4b74cef1d3d82b4b4a15ad8 /js/controllers
parent012b2af27a399fd12b58d5be86bd9509c422010d (diff)
parent62d3628e1a00d56a055bfe23a5b21bac1afdf2b8 (diff)
downloadninja-6ac505c3fc2b4be7628b9df339ab9f64de700c8b.tar.gz
Merge pull request #7 from ericguzman/binding
Binding Panel components css update
Diffstat (limited to 'js/controllers')
-rw-r--r--js/controllers/objects-controller.js28
1 files changed, 15 insertions, 13 deletions
diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index a02c3045..2c9f2d66 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -89,19 +89,21 @@ var objectsController = exports.ObjectsController = Montage.create(Component, {
89 bindingsArray = [], 89 bindingsArray = [],
90 property, descriptor, bindingArgsObject; 90 property, descriptor, bindingArgsObject;
91 91
92 for(property in descriptors) { 92 if(descriptors) {
93 if(descriptors.hasOwnProperty(property)) { 93 for(property in descriptors) {
94 descriptor = descriptors[property]; 94 if(descriptors.hasOwnProperty(property)) {
95 95 descriptor = descriptors[property];
96 bindingArgsObject = { 96
97 sourceObject : object, 97 bindingArgsObject = {
98 sourceObjectPropertyPath : property, 98 sourceObject : object,
99 boundObject : descriptor.boundObject, 99 sourceObjectPropertyPath : property,
100 boundObjectPropertyPath : descriptor.boundObjectPropertyPath, 100 boundObject : descriptor.boundObject,
101 onweway : descriptor.oneway 101 boundObjectPropertyPath : descriptor.boundObjectPropertyPath,
102 }; 102 oneway : descriptor.oneway
103 103 };
104 bindingsArray.push(bindingArgsObject); 104
105 bindingsArray.push(bindingArgsObject);
106 }
105 } 107 }
106 } 108 }
107 109