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

git.iko.soy/reflex-dom

Fixes to compile with GHC-7.8

commit8d515e8f6063168fb2342c170725ec24ac60487f authorJoachim Breitner <mail@joachim-breitner.de> dateThu 3 Sep 2015, 14:15 (11 years ago) parente082a7a

4 files changed+7−4

compare with develop

unifiedsplit

reflex-dom.cabal+3−3 src/Reflex/Dom/Time.hs+1 src/Reflex/Dom/Widget/Basic.hs+1−1 src/Reflex/Dom/Xhr.hs+2

reflex-dom.cabal+3−3

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

2626 semigroups == 0.16.*,

2727 mtl >= 2.1 && < 2.3,

2828 containers == 0.5.*,

29− these == 0.4.*,

29+ these >= 0.4,

3030 ref-tf == 0.4.*,

31− transformers == 0.4.*,

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

3232 lens >= 4.7 && < 4.10,

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

3434 safe == 0.3.*,

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

3636 bytestring == 0.10.*,

3737 data-default == 0.5.*,

3838 aeson >= 0.8 && < 0.10,

39− time == 1.5.*,

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

4040 exception-transformers == 0.4.*,

4141 directory == 1.2.*,

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

src/Reflex/Dom/Time.hs+1

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

1+{-# LANGUAGE DeriveDataTypeable #-}

12module Reflex.Dom.Time where

34import Reflex

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

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

588588 es <- wrapDomEventsMaybe e $ defaultDomEventHandler e

589589 return $ El e es

590590

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

592592elStopPropagationNS mns elementTag evt child = do

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

594594 liftIO $ onEventName evt e stopPropagation

src/Reflex/Dom/Xhr.hs+2

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

1+{-# LANGUAGE DeriveDataTypeable #-}

13module Reflex.Dom.Xhr

24 ( module Reflex.Dom.Xhr

35 , XMLHttpRequest