aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-28 18:00:07 -0700
committerValerio Virgillito2012-06-28 18:00:07 -0700
commit54f68d3635941489e34e53d9925c3659b3eeabbf (patch)
tree26cda6bb6f8a7f2af80a2bcf405b379f37d7600a /js/controllers
parentb4b54f6cc084b3f7483ebed1e15c1b4770949d58 (diff)
parentcd563af62e937f49406caca55549cd72b13ee228 (diff)
downloadninja-54f68d3635941489e34e53d9925c3659b3eeabbf.tar.gz
Merge pull request #355 from dhg637/GIO_binding-view
Gio binding view bugs and fixes
Diffstat (limited to 'js/controllers')
-rw-r--r--js/controllers/objects-controller.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 6557c14e..6ca869ba 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -27,7 +27,7 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
27 setTimeout(function() { 27 setTimeout(function() {
28 this.bindToModelObjects(); 28 this.bindToModelObjects();
29 }.bind(this), 1000); 29 }.bind(this), 1000);
30 30 this.currentObjectBindings = [];
31 this._currentDocument = doc; 31 this._currentDocument = doc;
32 }, 32 },
33 enumerable : false 33 enumerable : false
@@ -150,9 +150,9 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
150 var properties = []; 150 var properties = [];
151 151
152 for(var key in object) { 152 for(var key in object) {
153 if(object.hasOwnProperty(key)) { 153 //if(object.hasOwnProperty(key)) {
154 properties.push(key); 154 properties.push(key);
155 } 155 //}
156 } 156 }
157 157
158 if(excludeUnderscoreProperties) { 158 if(excludeUnderscoreProperties) {