Binding View - Objects Replace existing source Object if it exists

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

2 files changed, 10 insertions, 1 deletions

diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 3e35ef5f..6557c14e 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -58,7 +58,15 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
         value: function(bindingArgs) {
             if(!bindingArgs.sourceObject || !bindingArgs.sourceObjectPropertyPath || !bindingArgs) { return; }
 
-            Object.defineBinding(bindingArgs.sourceObject, bindingArgs.sourceObjectPropertyPath, bindingArgs);
+            var sourceObject = bindingArgs.sourceObject,
+                sourcePath = bindingArgs.sourceObjectPropertyPath,
+                sourceDescriptor = sourceObject._bindingDescriptors;
+
+            if(sourceDescriptor && sourceDescriptor[sourcePath]) {
+                this.removeBinding(bindingArgs);
+            }
+
+            Object.defineBinding(sourceObject, sourcePath, bindingArgs);
             this.currentObjectBindings = this.getObjectBindings(bindingArgs.sourceObject);
         }
     },
diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.js b/js/panels/binding/edit-binding-view.reel/edit-binding-view.js
index 4b20f74a..90fa30ba 100644
--- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.js
+++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.js
@@ -216,6 +216,7 @@ var editBindingView = exports.EditBindingView = Montage.create(Component, {
                     boundObjectPropertyPath  : this.boundObjectPropertyPath,
                     oneway: this.oneway
             };
+            debugger;
 
             if(this.isNewBinding) {
                 controller.addBinding(newBindingArgs);