Stop shadowing native JSON library.

This commit is contained in:
evancz 2012-10-19 01:07:45 -07:00
parent df4a43f8fc
commit a10b1319e5

View file

@ -1,5 +1,6 @@
var Elm = Elm || {}; var Elm = Elm || {};
var JSjson = JSON;
Elm.JSON = function() { Elm.JSON = function() {
var JS = Elm.JavaScript; var JS = Elm.JavaScript;
var empty = ['JSON',{}]; var empty = ['JSON',{}];
@ -88,11 +89,11 @@ Elm.JSON = function() {
return v[1]; return v[1];
} }
} }
return JSON.stringify(fromValue([ 'JsonObject', obj ]), null, JS.castStringToJSString(sep)); return JSjson.stringify(fromValue([ 'JsonObject', obj ]), null, JS.castStringToJSString(sep));
}; };
} }
function fromJSString(str) { function fromJSString(str) {
var obj = JSON.parse(str); var obj = JSjson.parse(str);
function toValue(v) { function toValue(v) {
switch (typeof v) { switch (typeof v) {
case 'string' : return [ "JsonString", JS.castJSStringToString(v) ]; case 'string' : return [ "JsonString", JS.castJSStringToString(v) ];
@ -134,4 +135,4 @@ Elm.JSON = function() {
JsonArray : JsonArray, JsonArray : JsonArray,
JsonObject : JsonObject JsonObject : JsonObject
}; };
}(); }();