diff options
| author | Armen Kesablyan | 2012-06-27 15:38:33 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-27 15:38:33 -0700 |
| commit | 8eb74d31d3c9ac60d48312d8774fd02cad0c77af (patch) | |
| tree | ae79629cedf9f683d77749a25988060ab9623216 /js/controllers/objects-controller.js | |
| parent | ec6759f9821a5647905617e3992fdda1cea390ef (diff) | |
| parent | 61a41e74154715b0b42a429158fa1f2a44d2eb9a (diff) | |
| download | ninja-8eb74d31d3c9ac60d48312d8774fd02cad0c77af.tar.gz | |
Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internal
Diffstat (limited to 'js/controllers/objects-controller.js')
| -rw-r--r-- | js/controllers/objects-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js index 6557c14e..f6d400f4 100644 --- a/js/controllers/objects-controller.js +++ b/js/controllers/objects-controller.js | |||
| @@ -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) { |