From 42be5de2d11ecfe5cb69d9c89477292faeb6312e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 30 Apr 2011 21:28:28 +0300 Subject: [PATCH] Minor fixes not in Github --- Yesod/Json.hs | 5 +++++ yesod-json.cabal | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Yesod/Json.hs b/Yesod/Json.hs index f4752c50..83c03538 100644 --- a/Yesod/Json.hs +++ b/Yesod/Json.hs @@ -52,3 +52,8 @@ jsonList = J.Array . V.fromList jsonMap :: [(String, Json)] -> Json jsonMap = J.Object . fromList . map (first pack) + +{- FIXME +instance ToJavascript J.Value where + toJavascript = fromLazyText . decodeUtf8 . toLazyByteString . JE.renderValue +-} diff --git a/yesod-json.cabal b/yesod-json.cabal index 4056493a..4fa1af67 100644 --- a/yesod-json.cabal +++ b/yesod-json.cabal @@ -13,7 +13,7 @@ homepage: http://docs.yesodweb.com/ library build-depends: base >= 4 && < 5 - , yesod-core >= 0.7 && < 0.8 + , yesod-core >= 0.8 && < 0.9 , aeson >= 0.3.1.1 && < 0.4 , text >= 0.8 && < 0.12 , vector