aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 22:52:30 -0700
committerEric Guzman2012-06-19 22:52:30 -0700
commit4bce228aa425fc9b6b9db59518275d248405ed9e (patch)
tree9800812de9faa47a22b3a44a515fbe8d60d532de /js/controllers
parent72efb92273d20757097b18326fb31d070a6d693d (diff)
parent20ea3997661b068fc6628ffa573e1b2d47e3a800 (diff)
downloadninja-4bce228aa425fc9b6b9db59518275d248405ed9e.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js/controllers')
-rw-r--r--js/controllers/objects-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 3a6f6e97..b8efd432 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -218,7 +218,7 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
218 218
219 if(value) { 219 if(value) {
220 this.currentObjectBindings = this.getObjectBindings(value); 220 this.currentObjectBindings = this.getObjectBindings(value);
221 console.log("Property list", this.getPropertyList(value, true)); 221 //console.log("Property list", this.getPropertyList(value, true));
222 } else { 222 } else {
223 this.currentObjectBindings = []; 223 this.currentObjectBindings = [];
224 } 224 }