diff options
| author | Misko Hevery | 2010-08-14 10:26:09 -0700 |
|---|---|---|
| committer | Misko Hevery | 2010-08-14 10:26:09 -0700 |
| commit | 14fe8cff2dc8225217de6b5bc553f93308f9490b (patch) | |
| tree | 23b131fdc9f23f450e913a57d432aee92f81987d /src/JSON.js | |
| parent | 791b13d1618f0773f366738094df0b78f4bc20d8 (diff) | |
| parent | 7159b30752f63ad8a127101cbc10d7e672ae1620 (diff) | |
| download | angular.js-14fe8cff2dc8225217de6b5bc553f93308f9490b.tar.bz2 | |
Merge remote branch 'igor/master'
Diffstat (limited to 'src/JSON.js')
| -rw-r--r-- | src/JSON.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/JSON.js b/src/JSON.js index 1e468e89..0311c317 100644 --- a/src/JSON.js +++ b/src/JSON.js @@ -70,7 +70,7 @@ function toJsonArray(buf, obj, pretty, stack){ var childPretty = pretty ? pretty + " " : false; var keys = []; for(var k in obj) { - if (k.indexOf('$$') === 0 || obj[k] === undefined) + if (!obj.hasOwnProperty(k) || k.indexOf('$$') === 0 || obj[k] === undefined) continue; keys.push(k); } |