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

Remove some blaze conditionals

Browse Source
This commit is contained in:
Michael Snoyman 2012-06-26 22:54:12 +03:00
parent 4a6e027d29
commit d465d30863
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
yesod-core/Yesod/Internal/Core.hs
View File

@ -85,11 +85,7 @@ import qualified Data.Text.Lazy as TL
import qualified Data.Text.Lazy.IO import qualified Data.Text.Lazy.IO
import qualified Data.Text.Lazy.Builder as TB import qualified Data.Text.Lazy.Builder as TB
import Language.Haskell.TH.Syntax (Loc (..), Lift (..)) import Language.Haskell.TH.Syntax (Loc (..), Lift (..))
#if MIN_VERSION_blaze_html(0, 5, 0)
import Text.Blaze (preEscapedToMarkup) import Text.Blaze (preEscapedToMarkup)
#else
import Text.Blaze (preEscapedLazyText)
#endif
import Data.Aeson (Value (Array, String)) import Data.Aeson (Value (Array, String))
import Data.Aeson.Encode (encode) import Data.Aeson.Encode (encode)
import qualified Data.Vector as Vector import qualified Data.Vector as Vector
@ -97,11 +93,6 @@ import Network.Wai.Middleware.Gzip (GzipSettings, def)
import qualified Paths_yesod_core import qualified Paths_yesod_core
import Data.Version (showVersion) import Data.Version (showVersion)
#if MIN_VERSION_blaze_html(0, 5, 0)
preEscapedLazyText :: TL.Text -> Html
preEscapedLazyText = preEscapedToMarkup
#endif
yesodVersion :: String yesodVersion :: String
yesodVersion = showVersion Paths_yesod_core.version yesodVersion = showVersion Paths_yesod_core.version
@ -522,7 +513,7 @@ maybeAuthorized r isWrite = do
return $ if x == Authorized then Just r else Nothing return $ if x == Authorized then Just r else Nothing
jsToHtml :: Javascript -> Html jsToHtml :: Javascript -> Html
jsToHtml (Javascript b) = preEscapedLazyText $ toLazyText b jsToHtml (Javascript b) = preEscapedToMarkup $ toLazyText b
jelper :: JavascriptUrl url -> HtmlUrl url jelper :: JavascriptUrl url -> HtmlUrl url
jelper = fmap jsToHtml jelper = fmap jsToHtml
@ -550,7 +541,7 @@ widgetToPageContent w = do
$ encodeUtf8 rendered $ encodeUtf8 rendered
return (mmedia, return (mmedia,
case x of case x of
Nothing -> Left $ preEscapedLazyText rendered Nothing -> Left $ preEscapedToMarkup rendered
Just y -> Right $ either id (uncurry render) y) Just y -> Right $ either id (uncurry render) y)
jsLoc <- jsLoc <-
case jscript of case jscript of