aboutsummaryrefslogtreecommitdiffstats
path: root/src/JSON.js
diff options
context:
space:
mode:
authorMisko Hevery2011-04-05 11:00:26 -0700
committerMisko Hevery2011-06-08 15:01:32 -0700
commit0e17ade959cc77369dc102d180e43be2af68505a (patch)
tree334c001ee00005eb3f67325523feb2afd961fdad /src/JSON.js
parentbb67ee8d28f2cddb4b503dc8909649994a4d67e1 (diff)
downloadangular.js-0e17ade959cc77369dc102d180e43be2af68505a.tar.bz2
Cleanup parser code to expose smaller API
Diffstat (limited to 'src/JSON.js')
-rw-r--r--src/JSON.js9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/JSON.js b/src/JSON.js
index 186bdb1c..942ce7c0 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -35,19 +35,14 @@ function toJson(obj, pretty) {
function fromJson(json, useNative) {
if (!isString(json)) return json;
- var obj, p, expression;
+ var obj;
try {
if (useNative && window.JSON && window.JSON.parse) {
obj = JSON.parse(json);
return transformDates(obj);
}
-
- p = parser(json, true);
- expression = p.primary();
- p.assertAllConsumed();
- return expression();
-
+ return parser(json, true).primary()();
} catch (e) {
error("fromJson error: ", json, e);
throw e;