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

Removed liftHandler- just use lift

Browse Source
This commit is contained in:
Michael Snoyman 2011-01-31 07:31:21 +02:00
parent 5b06e66382
commit 9de5c48c19
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Yesod/Widget.hs
View File

@ -7,7 +7,6 @@ module Yesod.Widget
( -- * Datatype ( -- * Datatype
GWidget GWidget
, GGWidget (..) , GGWidget (..)
, liftHandler
, PageContent (..) , PageContent (..)
-- * Creating -- * Creating
-- ** Head of page -- ** Head of page
@ -87,16 +86,11 @@ instance (Monad monad, a ~ ()) => Monad (HamletMonad (GGWidget s m monad a)) whe
return = GWidget' . return return = GWidget' . return
x >>= y = GWidget' $ runGWidget' x >>= runGWidget' . y x >>= y = GWidget' $ runGWidget' x >>= runGWidget' . y
-- | Lift an action in the 'GHandler' monad into an action in the 'GWidget'
-- monad.
liftHandler :: Monad monad => monad a -> GGWidget sub master monad a
liftHandler = GWidget . lift . lift . lift . lift . lift . lift . lift . lift
addSubWidget :: (YesodSubRoute sub master) => sub -> GWidget sub master a -> GWidget sub' master a addSubWidget :: (YesodSubRoute sub master) => sub -> GWidget sub master a -> GWidget sub' master a
addSubWidget sub w = do master <- liftHandler getYesod addSubWidget sub w = do master <- lift getYesod
let sr = fromSubRoute sub master let sr = fromSubRoute sub master
i <- GWidget $ lift $ lift $ lift $ lift $ lift $ lift $ lift get i <- GWidget $ lift $ lift $ lift $ lift $ lift $ lift $ lift get
w' <- liftHandler $ toMasterHandlerMaybe sr (const sub) Nothing $ flip runStateT i w' <- lift $ toMasterHandlerMaybe sr (const sub) Nothing $ flip runStateT i
$ runWriterT $ runWriterT $ runWriterT $ runWriterT $ runWriterT $ runWriterT $ runWriterT $ runWriterT
$ runWriterT $ runWriterT $ runWriterT $ runWriterT $ runWriterT $ runWriterT
$ unGWidget w $ unGWidget w