From 8b92389bc0deed2eb78ccf9cb0b67b39a6da195c Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Tue, 31 Jan 2012 09:09:06 -0300 Subject: [PATCH] update shakespeare-js to 0.11 --- yesod-core/Yesod/Widget.hs | 6 ++---- yesod-core/yesod-core.cabal | 2 +- yesod-default/yesod-default.cabal | 2 +- yesod-form/yesod-form.cabal | 2 +- yesod-json/yesod-json.cabal | 2 +- yesod/yesod.cabal | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/yesod-core/Yesod/Widget.hs b/yesod-core/Yesod/Widget.hs index da40e1f3..2a93e28d 100644 --- a/yesod-core/Yesod/Widget.hs +++ b/yesod-core/Yesod/Widget.hs @@ -256,16 +256,14 @@ addJuliusBody j = addHamlet $ \r -> H.script $ preEscapedLazyText $ renderJavasc addCoffee :: CoffeeUrl (Route master) -> GWidget sub master () addCoffee c = do render <- lift getUrlRenderParams - t <- liftIO $ renderCoffee render c - addJulius $ const $ Javascript $ fromLazyText t + addJulius $ const $ Javascript $ fromLazyText $ renderCoffeeUrl render c -- | Add a new script tag to the body with the contents of this Coffesscript -- template. Requires the coffeescript executable to be present at runtime. addCoffeeBody :: CoffeeUrl (Route master) -> GWidget sub master () addCoffeeBody c = do render <- lift getUrlRenderParams - t <- liftIO $ renderCoffee render c - addJuliusBody $ const $ Javascript $ fromLazyText t + addJuliusBody $ const $ Javascript $ fromLazyText $ renderCoffeeUrl render c -- | Content for a web page. By providing this datatype, we can easily create -- generic site templates, which would have the type signature: diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 8abc1ac4..b25895a7 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -56,7 +56,7 @@ library , path-pieces >= 0.1 && < 0.2 , hamlet >= 0.10.7 && < 0.11 , shakespeare >= 0.10 && < 0.11 - , shakespeare-js >= 0.10.4 && < 0.11 + , shakespeare-js >= 0.11 && < 0.12 , shakespeare-css >= 0.10.5 && < 0.11 , shakespeare-i18n >= 0.0 && < 0.1 , blaze-builder >= 0.2.1.4 && < 0.4 diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal index c008cf0e..75326305 100644 --- a/yesod-default/yesod-default.cabal +++ b/yesod-default/yesod-default.cabal @@ -27,7 +27,7 @@ library , text >= 0.9 , directory >= 1.0 , shakespeare-css >= 0.10.5 && < 0.11 - , shakespeare-js >= 0.10.4 && < 0.11 + , shakespeare-js >= 0.11 && < 0.12 , template-haskell , yaml >= 0.5.1.2 && < 0.6 , unordered-containers diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal index 1fde00f7..48f5b367 100644 --- a/yesod-form/yesod-form.cabal +++ b/yesod-form/yesod-form.cabal @@ -19,7 +19,7 @@ library , time >= 1.1.4 , hamlet >= 0.10 && < 0.11 , shakespeare-css >= 0.10 && < 0.11 - , shakespeare-js >= 0.10 && < 0.11 + , shakespeare-js >= 0.11 && < 0.12 , persistent >= 0.8 && < 0.9 , template-haskell , transformers >= 0.2.2 && < 0.3 diff --git a/yesod-json/yesod-json.cabal b/yesod-json/yesod-json.cabal index a6b1d380..1f8f98db 100644 --- a/yesod-json/yesod-json.cabal +++ b/yesod-json/yesod-json.cabal @@ -18,7 +18,7 @@ library , yesod-routes < 0.1 , aeson >= 0.5 , text >= 0.8 && < 1.0 - , shakespeare-js >= 0.10 && < 0.11 + , shakespeare-js >= 0.11 && < 0.12 , vector >= 0.9 , containers >= 0.2 , blaze-builder diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index 23493e10..464fde9f 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -84,7 +84,7 @@ library , wai-extra >= 1.1 && < 1.2 , wai-logger >= 0.1.2 , hamlet >= 0.10 && < 0.11 - , shakespeare-js >= 0.10 && < 0.11 + , shakespeare-js >= 0.11 && < 0.12 , shakespeare-css >= 0.10 && < 0.11 , warp >= 1.1 && < 1.2 , blaze-html >= 0.4.1.3 && < 0.5