7769cec · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Merge branch 'manyoo-develop' into develop

commit7769cec7c37c8d004141a616c1ce5de1380e593a authorRyan Trinkle <ryan.trinkle@gmail.com> dateMon 27 Apr 2015, 17:03 (11 years ago) parentd905941 26500cd

4 files changed+9−3

compare with develop

unifiedsplit

src-ghcjs/Reflex/Dom/Xhr/Foreign.hs+1 src/Reflex/Dom/Internal.hs+1 src/Reflex/Dom/Widget/Basic.hs+5−2 src/Reflex/Dom/Xhr.hs+2−1

src-ghcjs/Reflex/Dom/Xhr/Foreign.hs+1

@@ -7,6 +7,7 @@ import GHCJS.Foreign

77import GHCJS.Marshal

88import qualified Data.Text as T

99import Data.Text (Text)

10+import Data.Word

1011import GHCJS.DOM.Types hiding (Text)

1112import Control.Applicative ((<$>))

1213import GHCJS.DOM.EventM

src/Reflex/Dom/Internal.hs+1

@@ -20,6 +20,7 @@ import Control.Monad.Reader hiding (mapM, mapM_, forM, forM_, sequence, sequence

2020import Control.Monad.Ref

2121import Control.Monad.State.Strict hiding (mapM, mapM_, forM, forM_, sequence, sequence_, get)

2222import Control.Concurrent

23+import Control.Applicative

2324import Data.ByteString (ByteString)

2425import Data.Dependent.Sum (DSum (..))

2526import Data.Foldable

src/Reflex/Dom/Widget/Basic.hs+5−2

@@ -4,6 +4,7 @@ module Reflex.Dom.Widget.Basic where

55import Reflex.Dom.Class

7+import Prelude hiding (mapM, mapM_, sequence, sequence_)

78import Reflex

89import Reflex.Host.Class

910import Data.Functor.Misc

@@ -12,9 +13,11 @@ import qualified Data.Map as Map

1213import Data.Set (Set)

1314import qualified Data.Set as Set

1415import Data.Dependent.Sum (DSum (..))

16+import Data.Foldable

17+import Data.Traversable

1518import Control.Monad.Trans

16−import Control.Monad.Reader

17−import Control.Monad.State hiding (state)

19+import Control.Monad.Reader hiding (mapM, mapM_, forM, forM_, sequence, sequence_)

20+import Control.Monad.State hiding (state, mapM, mapM_, forM, forM_, sequence, sequence_)

1821import GHCJS.DOM.Node

1922import GHCJS.DOM.UIEvent

2023import GHCJS.DOM.EventM (event, EventM)

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

@@ -17,7 +17,7 @@ where

1717

1818import Control.Concurrent

1919import Control.Lens

20−import Control.Monad

20+import Control.Monad hiding (forM)

2121import Control.Monad.IO.Class

2222import Data.Aeson

2323import qualified Data.ByteString.Lazy as BL

@@ -27,6 +27,7 @@ import qualified Data.Map as Map

2727import Data.Maybe

2828import Data.Text (Text)

2929import Data.Text.Encoding

30+import Data.Traversable

3031import Reflex

3132import Reflex.Dom.Class

3233import Reflex.Dom.Xhr.Foreign