haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into yesod-1.4

Browse Source
This commit is contained in:
Michael Snoyman 2014-08-31 05:04:27 +03:00
commit 29d7e252f1
9 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-bin/hsfiles/mongo.hsfiles
View File

@ -436,6 +436,10 @@ library
, fast-logger >= 2.2 && < 2.3 , fast-logger >= 2.2 && < 2.3
, wai-logger >= 2.2 && < 2.3 , wai-logger >= 2.2 && < 2.3
-- see https://github.com/yesodweb/yesod/issues/814
if !os(windows)
build-depends: unix
executable PROJECTNAME executable PROJECTNAME
if flag(library-only) if flag(library-only)
Buildable: False Buildable: False

4
yesod-bin/hsfiles/mysql.hsfiles
View File

@ -440,6 +440,10 @@ library
, fast-logger >= 2.2 && < 2.3 , fast-logger >= 2.2 && < 2.3
, wai-logger >= 2.2 && < 2.3 , wai-logger >= 2.2 && < 2.3
-- see https://github.com/yesodweb/yesod/issues/814
if !os(windows)
build-depends: unix
executable PROJECTNAME executable PROJECTNAME
if flag(library-only) if flag(library-only)
Buildable: False Buildable: False

4
yesod-bin/hsfiles/postgres-fay.hsfiles
View File

@ -477,6 +477,10 @@ library
, fast-logger >= 2.2 && < 2.3 , fast-logger >= 2.2 && < 2.3
, wai-logger >= 2.2 && < 2.3 , wai-logger >= 2.2 && < 2.3
-- see https://github.com/yesodweb/yesod/issues/814
if !os(windows)
build-depends: unix
executable PROJECTNAME executable PROJECTNAME
if flag(library-only) if flag(library-only)
Buildable: False Buildable: False

4
yesod-bin/hsfiles/postgres.hsfiles
View File

@ -440,6 +440,10 @@ library
, fast-logger >= 2.2 && < 2.3 , fast-logger >= 2.2 && < 2.3
, wai-logger >= 2.2 && < 2.3 , wai-logger >= 2.2 && < 2.3
-- see https://github.com/yesodweb/yesod/issues/814
if !os(windows)
build-depends: unix
executable PROJECTNAME executable PROJECTNAME
if flag(library-only) if flag(library-only)
Buildable: False Buildable: False

4
yesod-bin/hsfiles/simple.hsfiles
View File

@ -364,6 +364,10 @@ library
, fast-logger >= 2.2 && < 2.3 , fast-logger >= 2.2 && < 2.3
, wai-logger >= 2.2 && < 2.3 , wai-logger >= 2.2 && < 2.3
-- see https://github.com/yesodweb/yesod/issues/814
if !os(windows)
build-depends: unix
executable PROJECTNAME executable PROJECTNAME
if flag(library-only) if flag(library-only)
Buildable: False Buildable: False

4
yesod-bin/hsfiles/sqlite.hsfiles
View File

@ -440,6 +440,10 @@ library
, fast-logger >= 2.2 && < 2.3 , fast-logger >= 2.2 && < 2.3
, wai-logger >= 2.2 && < 2.3 , wai-logger >= 2.2 && < 2.3
-- see https://github.com/yesodweb/yesod/issues/814
if !os(windows)
build-depends: unix
executable PROJECTNAME executable PROJECTNAME
if flag(library-only) if flag(library-only)
Buildable: False Buildable: False

2
yesod-core/Yesod/Core/Class/Yesod.hs
View File

@ -94,7 +94,7 @@ class RenderRoute site => Yesod site where
defaultLayout w = do defaultLayout w = do
p <- widgetToPageContent w p <- widgetToPageContent w
mmsg <- getMessage mmsg <- getMessage
giveUrlRenderer [hamlet| withUrlRenderer [hamlet|
$newline never $newline never
$doctype 5 $doctype 5
<html> <html>

22
yesod-core/Yesod/Core/Handler.hs
View File

@ -139,6 +139,7 @@ module Yesod.Core.Handler
-- ** Hamlet -- ** Hamlet
, hamletToRepHtml , hamletToRepHtml
, giveUrlRenderer , giveUrlRenderer
, withUrlRenderer
-- ** Misc -- ** Misc
, newIdent , newIdent
-- * Lifting -- * Lifting
@ -854,7 +855,7 @@ redirectToPost :: (MonadHandler m, RedirectUrl (HandlerSite m) url)
-> m a -> m a
redirectToPost url = do redirectToPost url = do
urlText <- toTextUrl url urlText <- toTextUrl url
giveUrlRenderer [hamlet| withUrlRenderer [hamlet|
$newline never $newline never
$doctype 5 $doctype 5
@ -870,17 +871,26 @@ $doctype 5
-- | Wraps the 'Content' generated by 'hamletToContent' in a 'RepHtml'. -- | Wraps the 'Content' generated by 'hamletToContent' in a 'RepHtml'.
hamletToRepHtml :: MonadHandler m => HtmlUrl (Route (HandlerSite m)) -> m Html hamletToRepHtml :: MonadHandler m => HtmlUrl (Route (HandlerSite m)) -> m Html
hamletToRepHtml = giveUrlRenderer hamletToRepHtml = withUrlRenderer
{-# DEPRECATED hamletToRepHtml "Use giveUrlRenderer instead" #-} {-# DEPRECATED hamletToRepHtml "Use withUrlRenderer instead" #-}
-- | Provide a URL rendering function to the given function and return the -- | Deprecated synonym for 'withUrlRenderer'.
-- result. Useful for processing Shakespearean templates.
-- --
-- Since 1.2.0 -- Since 1.2.0
giveUrlRenderer :: MonadHandler m giveUrlRenderer :: MonadHandler m
=> ((Route (HandlerSite m) -> [(Text, Text)] -> Text) -> output) => ((Route (HandlerSite m) -> [(Text, Text)] -> Text) -> output)
-> m output -> m output
giveUrlRenderer f = do giveUrlRenderer = withUrlRenderer
{-# DEPRECATED giveUrlRenderer "Use withUrlRenderer instead" #-}
-- | Provide a URL rendering function to the given function and return the
-- result. Useful for processing Shakespearean templates.
--
-- Since 1.2.20
withUrlRenderer :: MonadHandler m
=> ((Route (HandlerSite m) -> [(Text, Text)] -> Text) -> output)
-> m output
withUrlRenderer f = do
render <- getUrlRenderParams render <- getUrlRenderParams
return $ f render return $ f render

2
yesod-core/yesod-core.cabal
View File

@ -1,5 +1,5 @@
name: yesod-core name: yesod-core
version: 1.2.19.2 version: 1.2.20
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>