8d515e8 · reflex-dom · git.iko.soy

reflex-dom.cabal+3−3

compare with develop

unifiedsplit

@@ -26,9 +26,9 @@ library

26 semigroups == 0.16.*,

27 mtl >= 2.1 && < 2.3,

28 containers == 0.5.*,

29− these == 0.4.*,

29+ these >= 0.4,

30 ref-tf == 0.4.*,

31− transformers == 0.4.*,

31+ transformers == 0.3.* || 0.4.*,

32 lens >= 4.7 && < 4.10,

33 ghcjs-dom >= 0.1.1.3 && < 0.2,

34 safe == 0.3.*,

@@ -36,7 +36,7 @@ library

36 bytestring == 0.10.*,

37 data-default == 0.5.*,

38 aeson >= 0.8 && < 0.10,

39− time == 1.5.*,

39+ time == 1.4.* || 1.5.*,

40 exception-transformers == 0.4.*,

41 directory == 1.2.*,

42 dependent-sum-template >= 0.0.0.4 && < 0.1,

src/Reflex/Dom/Time.hs+1

@@ -1,3 +1,4 @@

1+{-# LANGUAGE DeriveDataTypeable #-}

1module Reflex.Dom.Time where

2module Reflex.Dom.Time where

2

3

3import Reflex

4import Reflex

src/Reflex/Dom/Widget/Basic.hs+1−1

@@ -588,7 +588,7 @@ wrapElement e = do

588 es <- wrapDomEventsMaybe e $ defaultDomEventHandler e

589 return $ El e es

590

591−elStopPropagationNS :: (MonadWidget t m, EventClass (EventType en)) => Maybe String -> String -> EventName en -> m a -> m a

591+elStopPropagationNS :: (MonadWidget t m, IsEvent (EventType en)) => Maybe String -> String -> EventName en -> m a -> m a

592elStopPropagationNS mns elementTag evt child = do

593 (e, result) <- buildElementNS mns elementTag (Map.empty :: Map String String) child

594 liftIO $ onEventName evt e stopPropagation

src/Reflex/Dom/Xhr.hs+2

@@ -1,3 +1,5 @@

1+{-# LANGUAGE DeriveDataTypeable #-}

2+

1module Reflex.Dom.Xhr

3module Reflex.Dom.Xhr

2 ( module Reflex.Dom.Xhr

4 ( module Reflex.Dom.Xhr

3 , XMLHttpRequest

5 , XMLHttpRequest