0d7665f · reflex-dom · git.iko.soy

reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+12−6

compare with develop

unifiedsplit

@@ -16,13 +16,19 @@ import Reflex.Requester.Base (RequesterT)

16import Reflex.TriggerEvent.Base

17import Reflex.Query.Base (QueryT)

18

19−instance (MonadJSM m, ReflexHost t) => MonadJSM (PostBuildT t m)

19+instance (MonadJSM m, ReflexHost t) => MonadJSM (PostBuildT t m) where

20+ liftJSM' = lift . liftJSM'

20instance (MonadJSM (HostFrame t), ReflexHost t) => MonadJSM (PerformEventT t m) where

21instance (MonadJSM (HostFrame t), ReflexHost t) => MonadJSM (PerformEventT t m) where

21 liftJSM' = PerformEventT . lift . liftJSM'

22 liftJSM' = PerformEventT . lift . liftJSM'

22−instance MonadJSM m => MonadJSM (DynamicWriterT t w m)

23+instance MonadJSM m => MonadJSM (DynamicWriterT t w m) where

24+ liftJSM' = lift . liftJSM'

23−instance MonadJSM m => MonadJSM (EventWriterT t w m)

25+instance MonadJSM m => MonadJSM (EventWriterT t w m) where

26+ liftJSM' = lift . liftJSM'

24−instance MonadJSM m => MonadJSM (RequesterT t request response m)

27+instance MonadJSM m => MonadJSM (RequesterT t request response m) where

28+ liftJSM' = lift . liftJSM'

25−instance MonadJSM m => MonadJSM (TriggerEventT t m)

29+instance MonadJSM m => MonadJSM (TriggerEventT t m) where

30+ liftJSM' = lift . liftJSM'

26−instance MonadJSM m => MonadJSM (QueryT t q m)

31+instance MonadJSM m => MonadJSM (QueryT t q m) where

32+ liftJSM' = lift . liftJSM'

27

33

28#endif

34#endif

reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+3

@@ -7,6 +7,9 @@

7{-# LANGUAGE FlexibleInstances #-}

8{-# LANGUAGE FunctionalDependencies #-}

9{-# LANGUAGE GeneralizedNewtypeDeriving #-}

10+#if !MIN_VERSION_base(4,9,0)

11+{-# LANGUAGE ImpredicativeTypes #-}

12+#endif

10{-# LANGUAGE LambdaCase #-}

13{-# LANGUAGE LambdaCase #-}

11{-# LANGUAGE MultiParamTypeClasses #-}

14{-# LANGUAGE MultiParamTypeClasses #-}

12{-# LANGUAGE OverloadedStrings #-}

15{-# LANGUAGE OverloadedStrings #-}

reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+4

@@ -760,7 +760,11 @@ instance (Reflex t, MonadAdjust t m, MonadJSM m, MonadHold t m, MonadFix m, Prim

760 mapM_ (\(k :=> v) -> void $ placeFragment k v) $ DMap.toDescList p -- We need to go in reverse order here, to make sure the placeholders are in the right spot at the right time

761 liftIO $ writeIORef placeholders $! phsAfter

762

763+#if MIN_VERSION_base(4,9,0)

763data ChildReadyState k

764data ChildReadyState k

765+#else

766+data ChildReadyState (k :: * -> *)

767+#endif

764 = ChildReadyState_Ready

768 = ChildReadyState_Ready

765 | ChildReadyState_Unready !(Maybe (Some k))

769 | ChildReadyState_Unready !(Maybe (Some k))

766 deriving (Show, Read, Eq, Ord)

770 deriving (Show, Read, Eq, Ord)