diff options
author | Nivesh Rajbhandari | 2012-06-29 11:50:17 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-29 11:50:17 -0700 |
commit | 81d75ac08ff24dc3078d79a9133e54f592c23026 (patch) | |
tree | 4f4136503c87a72f7af67a54dad69c14469ee01e /js/controllers/objects-controller.js | |
parent | 01783536d2245b474eb1f89df673bfabb006cbdd (diff) | |
parent | ecd9e3b3b09695e3e7115c04e75add5a20c5c6fe (diff) | |
download | ninja-81d75ac08ff24dc3078d79a9133e54f592c23026.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ColorGradientFix
Diffstat (limited to 'js/controllers/objects-controller.js')
-rw-r--r-- | js/controllers/objects-controller.js | 6 |
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) { |