aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-15 15:03:26 -0700
committerArmen Kesablyan2012-06-15 15:03:26 -0700
commit45aeaaf9aa61dcd5a55f12817ef8e6036ba74606 (patch)
treebdbe9415a3ab5a1784de3af1814cfde8d5f75913 /js/controllers
parent5bf62b3dacfff71d906286716dc0d73e2cb05bb8 (diff)
parent022e2ba65070ee1e5eb2d4b197b88768a1ea3f4f (diff)
downloadninja-45aeaaf9aa61dcd5a55f12817ef8e6036ba74606.tar.gz
Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding
Diffstat (limited to 'js/controllers')
-rw-r--r--js/controllers/objects-controller.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 386ef683..877f7f9f 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -66,7 +66,7 @@ var objectsController = exports.ObjectsController = Montage.create(Component, {
66 if(!bindingArgs.sourceObject || !bindingArgs.sourceObjectPropertyPath || !bindingArgs) { return; } 66 if(!bindingArgs.sourceObject || !bindingArgs.sourceObjectPropertyPath || !bindingArgs) { return; }
67 67
68 Object.defineBinding(bindingArgs.sourceObject, bindingArgs.sourceObjectPropertyPath, bindingArgs); 68 Object.defineBinding(bindingArgs.sourceObject, bindingArgs.sourceObjectPropertyPath, bindingArgs);
69 this.currentObjectBindings = this.getObjectBindings(value); 69 this.currentObjectBindings = this.getObjectBindings(bindingArgs.sourceObject);
70 } 70 }
71 }, 71 },
72 72
@@ -77,7 +77,7 @@ var objectsController = exports.ObjectsController = Montage.create(Component, {
77 77
78 78
79 Object.deleteBinding(bindingArgs.sourceObject, bindingArgs.sourceObjectPropertyPath); 79 Object.deleteBinding(bindingArgs.sourceObject, bindingArgs.sourceObjectPropertyPath);
80 this.currentObjectBindings = this.getObjectBindings(value); 80 this.currentObjectBindings = this.getObjectBindings(bindingArgs.sourceObject);
81 } 81 }
82 }, 82 },
83 83