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

blaze-builder 0.2.1

Browse Source
This commit is contained in:
Michael Snoyman 2010-12-13 23:20:44 +02:00
parent e6a3936577
commit 2cc68e8256
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Yesod/Form/Profiles.hs
View File

@ -33,7 +33,8 @@ import Text.HTML.SanitizeXSS (sanitizeBalance)
import Control.Monad (when) import Control.Monad (when)
import qualified Blaze.ByteString.Builder.Html.Utf8 as B import qualified Blaze.ByteString.Builder.Html.Utf8 as B
import Blaze.ByteString.Builder (fromWrite4List, writeByteString) import Blaze.ByteString.Builder (writeByteString)
import Blaze.ByteString.Builder.Internal.Write (fromWriteList)
import Yesod.Internal (lbsToChars) import Yesod.Internal (lbsToChars)
@ -108,7 +109,7 @@ newtype Textarea = Textarea { unTextarea :: String }
deriving (Show, Read, Eq, PersistField) deriving (Show, Read, Eq, PersistField)
instance ToHtml Textarea where instance ToHtml Textarea where
toHtml = toHtml =
Html . fromWrite4List writeHtmlEscapedChar . unTextarea Html . fromWriteList writeHtmlEscapedChar . unTextarea
where where
-- Taken from blaze-builder and modified with newline handling. -- Taken from blaze-builder and modified with newline handling.
writeHtmlEscapedChar '\n' = writeByteString "<br>" writeHtmlEscapedChar '\n' = writeByteString "<br>"

3
Yesod/Json.hs
View File

@ -25,6 +25,7 @@ import Numeric (showHex)
import Data.Monoid (Monoid (..)) import Data.Monoid (Monoid (..))
import Blaze.ByteString.Builder import Blaze.ByteString.Builder
import Blaze.ByteString.Builder.Char.Utf8 (writeChar) import Blaze.ByteString.Builder.Char.Utf8 (writeChar)
import Blaze.ByteString.Builder.Internal.Write (fromWriteList)
#if TEST #if TEST
import Test.Framework (testGroup, Test) import Test.Framework (testGroup, Test)
@ -63,7 +64,7 @@ jsonToRepJson = fmap RepJson . jsonToContent
jsonScalar :: String -> Json jsonScalar :: String -> Json
jsonScalar s = Json $ mconcat jsonScalar s = Json $ mconcat
[ fromByteString "\"" [ fromByteString "\""
, fromWrite4List writeJsonChar s , fromWriteList writeJsonChar s
, fromByteString "\"" , fromByteString "\""
] ]
where where

4
yesod.cabal
View File

@ -1,5 +1,5 @@
name: yesod name: yesod
version: 0.6.6 version: 0.6.7
license: BSD3 license: BSD3
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -37,7 +37,7 @@ library
, template-haskell >= 2.4 && < 2.6 , template-haskell >= 2.4 && < 2.6
, web-routes-quasi >= 0.6.2 && < 0.7 , web-routes-quasi >= 0.6.2 && < 0.7
, hamlet >= 0.5.1 && < 0.7 , hamlet >= 0.5.1 && < 0.7
, blaze-builder >= 0.2 && < 0.3 , blaze-builder >= 0.2.1 && < 0.3
, transformers >= 0.2 && < 0.3 , transformers >= 0.2 && < 0.3
, clientsession >= 0.4.0 && < 0.5 , clientsession >= 0.4.0 && < 0.5
, pureMD5 >= 1.1.0.0 && < 2.2 , pureMD5 >= 1.1.0.0 && < 2.2