Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding

Conflicts:
	js/tools/bindingTool.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

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, {
                 bindingsArray = [],
                 property, descriptor, bindingArgsObject;
 
-            for(property in descriptors) {
-                if(descriptors.hasOwnProperty(property)) {
-                    descriptor = descriptors[property];
-
-                    bindingArgsObject = {
-                        sourceObject : object,
-                        sourceObjectPropertyPath : property,
-                        boundObject : descriptor.boundObject,
-                        boundObjectPropertyPath : descriptor.boundObjectPropertyPath,
-                        onweway : descriptor.oneway
-                    };
-
-                    bindingsArray.push(bindingArgsObject);
+            if(descriptors) {
+                for(property in descriptors) {
+                    if(descriptors.hasOwnProperty(property)) {
+                        descriptor = descriptors[property];
+
+                        bindingArgsObject = {
+                            sourceObject : object,
+                            sourceObjectPropertyPath : property,
+                            boundObject : descriptor.boundObject,
+                            boundObjectPropertyPath : descriptor.boundObjectPropertyPath,
+                            oneway : descriptor.oneway
+                        };
+
+                        bindingsArray.push(bindingArgsObject);
+                    }
                 }
             }