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

1 files changed, 12 insertions, 4 deletions

diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index ee203336..2ce10e82 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -69,15 +69,23 @@ var objectsController = exports.ObjectsController = Montage.create(Component, {
         value: function(bindingArgs) {
             if(!bindingArgs) { return; }
 
+
+
             Object.deleteBinding(bindingArgs.sourceObject, bindingArgs.sourceObjectPropertyPath);
         }
     },
 
-    editBindingPropertyPath : {
-        value: function(bindingArgs, newPropertyPath) {
+    editBinding : {
+        value: function(bindingArgs, newProperties) {
+            var property;
+
             this.removeBinding(bindingArgs);
 
-            bindingArgs.boundObjectPropertyPath = 'newPropertyPath';
+            if(newProperties) {
+                for(property in newProperties) {
+                    bindingArgs[property] = newProperties[property];
+                }
+            }
 
             this.addBinding(bindingArgs);
         }
@@ -171,7 +179,7 @@ var objectsController = exports.ObjectsController = Montage.create(Component, {
             return this._currentObject;
         },
         set: function(value) {
-            if(value === this._currentObject) { return; }
+            //if(value === this._currentObject) { return; }
 
             if(value) {
                 this.currentObjectBindings = this.getObjectBindings(value);