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

fix defaultLayoutSub

Browse Source
This commit is contained in:
Greg Weber 2015-05-20 00:30:48 -07:00
parent f3e8e778f1
commit c20766929f
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yesod-core/Yesod/Core.hs
View File

@ -55,8 +55,7 @@ module Yesod.Core
-- * Subsites -- * Subsites
, MonadHandler (..) , MonadHandler (..)
, getRouteToParent , getRouteToParent
-- FIXME , defaultLayoutSub
-- , defaultLayoutSub
-- * Misc -- * Misc
, yesodVersion , yesodVersion
, yesodRender , yesodRender
@ -108,6 +107,7 @@ import Yesod.Core.Class.Handler
import Yesod.Core.Json import Yesod.Core.Json
import Yesod.Core.Types import Yesod.Core.Types
import Yesod.Core.Internal.Util (formatW3 , formatRFC1123 , formatRFC822) import Yesod.Core.Internal.Util (formatW3 , formatRFC1123 , formatRFC822)
import Yesod.Core.Widget
import Text.Blaze.Html (Html, toHtml, preEscapedToMarkup) import Text.Blaze.Html (Html, toHtml, preEscapedToMarkup)
import Control.Monad.Logger import Control.Monad.Logger
@ -157,12 +157,10 @@ maybeAuthorized r isWrite = do
getRouteToParent :: Monad m => HandlerT child (HandlerT parent m) (Route child -> Route parent) getRouteToParent :: Monad m => HandlerT child (HandlerT parent m) (Route child -> Route parent)
getRouteToParent = HandlerT $ return . handlerToParent getRouteToParent = HandlerT $ return . handlerToParent
{-
defaultLayoutSub :: Yesod parent defaultLayoutSub :: Yesod parent
=> WidgetT child IO () => WidgetT child IO ()
-> HandlerT child (HandlerT parent IO) Html -> HandlerT child (HandlerT parent IO) Html
defaultLayoutSub cwidget = widgetToParentWidget cwidget >>= lift . defaultLayout defaultLayoutSub cwidget = widgetToParentWidget cwidget >>= lift . defaultLayout
-}
showIntegral :: Integral a => a -> String showIntegral :: Integral a => a -> String
showIntegral x = show (fromIntegral x :: Integer) showIntegral x = show (fromIntegral x :: Integer)

1
yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
View File

@ -9,7 +9,6 @@ import YesodCoreTest.NoOverloadedStringsSub
import Yesod.Core import Yesod.Core
import Yesod.Core.Widget import Yesod.Core.Widget
import Yesod.Shakespeare import Yesod.Shakespeare
import Network.Wai
import Network.Wai.Test import Network.Wai.Test
import Data.Monoid (mempty) import Data.Monoid (mempty)
import qualified Data.Text as T import qualified Data.Text as T