a10b131 · elk · git.iko.soy

Stop shadowing native JSON library.

commita10b1319e5a5c0a10b4bf136e0317f2a3acbd741 authorevancz <info@elm-lang.org> dateFri 19 Oct 2012, 01:07 (14 years ago) parentdf4a43f

1 file changed+4−3

unifiedsplit

core-js/foreign/JSON.js+4−3

@@ -1,5 +1,6 @@

22var Elm = Elm || {};

3+var JSjson = JSON;

34Elm.JSON = function() {

45 var JS = Elm.JavaScript;

56 var empty = ['JSON',{}];

@@ -88,11 +89,11 @@ Elm.JSON = function() {

8889 return v[1];

8990 }

9091 }

91− return JSON.stringify(fromValue([ 'JsonObject', obj ]), null, JS.castStringToJSString(sep));

92+ return JSjson.stringify(fromValue([ 'JsonObject', obj ]), null, JS.castStringToJSString(sep));

9293 };

9394 }

9495 function fromJSString(str) {

95− var obj = JSON.parse(str);

96+ var obj = JSjson.parse(str);

9697 function toValue(v) {

9798 switch (typeof v) {

9899 case 'string' : return [ "JsonString", JS.castJSStringToString(v) ];

@@ -134,4 +135,4 @@ Elm.JSON = function() {

134135 JsonArray : JsonArray,

135136 JsonObject : JsonObject

136137 };

137−}();

138+}();