diff options
| author | Misko Hevery | 2010-03-31 13:57:25 -0700 |
|---|---|---|
| committer | Misko Hevery | 2010-03-31 13:57:25 -0700 |
| commit | 35a91085004e31f786df1e0011bc26ed0142ab4d (patch) | |
| tree | 030289973e8ae5a88e86fc77d878dde40b72ddc5 /src/JSON.js | |
| parent | b5b8f63e1ebc75d09c6faf8dbad6497880deed47 (diff) | |
| download | angular.js-35a91085004e31f786df1e0011bc26ed0142ab4d.tar.bz2 | |
all tests green, some dissabled
Diffstat (limited to 'src/JSON.js')
| -rw-r--r-- | src/JSON.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/JSON.js b/src/JSON.js index baf3a2fa..69e1b4c0 100644 --- a/src/JSON.js +++ b/src/JSON.js @@ -11,6 +11,7 @@ function toPrettyJson(obj) { }; function fromJson(json) { + if (!json) return json; try { var parser = new Parser(json, true); var expression = parser.primary(); |