Merge branch 'master' into webgl
commit5c830e13969e9a2b4729f0b0c0f494ff64eb38f0
authorJohn P Mayer Jr <john.p.mayer.jr@gmail.com>
dateMon 31 Mar 2014, 23:16 (13 years ago)
parent069c382019ed56
libraries/JavaScript/Experimental.elm+2−1
@@ -9,6 +9,7 @@ improve as we find its key failings.
99-}
1010
1111import Native.JavaScript
12+import Native.Json
1213import Json
1314
1415data RawObject = RawObject
@@ -52,4 +53,4 @@ toJson = Native.Json.fromJS
5253JavaScript object.
5354-}
5455fromJson : Json.Value -> RawObject
55−fromJson = Native.Json.toJS
56+fromJson = Native.Json.toJS