yesod-json 1.1.1 → 1.1.2
raw patch · 2 files changed
+6/−2 lines, 2 filesdep ~shakespeare-js
Dependency ranges changed: shakespeare-js
Files
- Yesod/Json.hs +4/−0
- yesod-json.cabal +2/−2
Yesod/Json.hs view
@@ -51,11 +51,13 @@ import qualified Data.ByteString.Char8 as B8 import Safe (headMay) +#if !MIN_VERSION_yesod_core(1, 1, 5) instance ToContent J.Value where toContent = flip ContentBuilder Nothing . Blaze.fromLazyText . toLazyText . fromValue+#endif -- | Provide both an HTML and JSON representation for a piece of -- data, using the default layout for the HTML output@@ -97,8 +99,10 @@ J.Error s -> invalidArgs [pack s] J.Success a -> return a +#if !MIN_VERSION_shakespeare_js(1, 0, 2) instance ToJavascript J.Value where toJavascript = fromLazyText . decodeUtf8 . JE.encode+#endif -- | Convert a list of pairs to an 'J.Object'. object :: J.ToJSON a => [(Text, a)] -> J.Value
yesod-json.cabal view
@@ -1,5 +1,5 @@ name: yesod-json-version: 1.1.1+version: 1.1.2 license: MIT license-file: LICENSE author: Michael Snoyman <michael@snoyman.com>@@ -18,7 +18,7 @@ , yesod-routes >= 1.1 && < 1.2 , aeson >= 0.5 , text >= 0.8 && < 1.0- , shakespeare-js >= 1.0 && < 1.1+ , shakespeare-js >= 1.0 && < 1.2 , vector >= 0.9 , containers >= 0.2 , blaze-builder