c30e6fb · reflex-dom · git.iko.soy

default.nix+1−2

compare with develop

unifiedsplit

@@ -1,6 +1,6 @@

1{ mkDerivation, dependent-map, ghcjs-dom, lens

2, mtl, reflex, safe, text, these

3−, transformers, data-default, semigroups, string-conv

3+, transformers, data-default, semigroups

4}:

5

6mkDerivation {

@@ -19,7 +19,6 @@ mkDerivation {

19 text

20 data-default

21 semigroups

22− string-conv

23 ];

22 ];

24 license = null;

23 license = null;

25}

24}

reflex-dom.cabal+1−2

@@ -34,8 +34,7 @@ library

34 cpp-options: -D__GHCJS__

35 build-depends:

36 aeson,

37− ghcjs-base,

37+ ghcjs-base

38− string-conv

39

38

40 exposed-modules:

39 exposed-modules:

41 Reflex.Dom

40 Reflex.Dom

src/Reflex/Dom/Xhr.hs+3−2

@@ -8,13 +8,14 @@ import Control.Lens

8import Control.Monad

9import Control.Monad.IO.Class

10import Data.Aeson

11+import qualified Data.ByteString.Lazy as BL

11import Data.Default

12import Data.Default

12import Data.Map (Map)

13import Data.Map (Map)

13import qualified Data.Map as Map

14import qualified Data.Map as Map

14import Data.Maybe

15import Data.Maybe

15−import Data.String.Conv

16import Data.Text (Text)

17import qualified Data.Text as T

18+import Data.Text.Encoding

18import GHCJS.Foreign

19import GHCJS.Foreign

19import GHCJS.Types

20import GHCJS.Types

20import GHCJS.DOM.XMLHttpRequest

21import GHCJS.DOM.XMLHttpRequest

@@ -100,7 +101,7 @@ getMay f e = do

100 return $ leftmost [fmap Just e', fmapMaybe (maybe (Just Nothing) (const Nothing)) e]

101 return $ leftmost [fmap Just e', fmapMaybe (maybe (Just Nothing) (const Nothing)) e]

101

102

102decodeText :: FromJSON a => Text -> Maybe a

103decodeText :: FromJSON a => Text -> Maybe a

103−decodeText = decode . toS

104+decodeText = decode . BL.fromStrict . encodeUtf8

104

105

105decodeJSString :: FromJSON a => JSString -> Maybe a

106decodeJSString :: FromJSON a => JSString -> Maybe a

106decodeJSString = decodeText . fromJSString

107decodeJSString = decodeText . fromJSString