git.iko.soy/reflex-dom
on develop help sign in
Remove string-conv dependency
commitc30e6fb5de54751fae6a67c6da766e4bce820dc1 authorAli Abrar <aliabrar@gmail.com> dateSat 14 Mar 2015, 12:46 (12 years ago) parent300f893
3 files changed+5−6
compare with develop
unifiedsplit
default.nix+1−2 reflex-dom.cabal+1−2 src/Reflex/Dom/Xhr.hs+3−2
default.nix+1−2
@@ -1,6 +1,6 @@
11{ mkDerivation, dependent-map, ghcjs-dom, lens
22, mtl, reflex, safe, text, these
3−, transformers, data-default, semigroups, string-conv
3+, transformers, data-default, semigroups
44}:
55
66mkDerivation {
@@ -19,7 +19,6 @@ mkDerivation {
1919 text
2020 data-default
2121 semigroups
22− string-conv
2322 ];
2423 license = null;
2524}
reflex-dom.cabal+1−2
@@ -34,8 +34,7 @@ library
3434 cpp-options: -D__GHCJS__
3535 build-depends:
3636 aeson,
37− ghcjs-base,
38− string-conv
37+ ghcjs-base
3938
4039 exposed-modules:
4140 Reflex.Dom
src/Reflex/Dom/Xhr.hs+3−2
@@ -8,13 +8,14 @@ import Control.Lens
88import Control.Monad
99import Control.Monad.IO.Class
1010import Data.Aeson
11+import qualified Data.ByteString.Lazy as BL
1112import Data.Default
1213import Data.Map (Map)
1314import qualified Data.Map as Map
1415import Data.Maybe
15−import Data.String.Conv
1616import Data.Text (Text)
1717import qualified Data.Text as T
18+import Data.Text.Encoding
1819import GHCJS.Foreign
1920import GHCJS.Types
2021import GHCJS.DOM.XMLHttpRequest
@@ -100,7 +101,7 @@ getMay f e = do
100101 return $ leftmost [fmap Just e', fmapMaybe (maybe (Just Nothing) (const Nothing)) e]
101102
102103decodeText :: FromJSON a => Text -> Maybe a
103−decodeText = decode . toS
104+decodeText = decode . BL.fromStrict . encodeUtf8
104105
105106decodeJSString :: FromJSON a => JSString -> Maybe a
106107decodeJSString = decodeText . fromJSString