git.iko.soy/reflex
on develop help sign in
Merge branch 'develop' into fast-weak
commitff45d50f869b6a7b6008e6d0fd51415a726e22b7 authorRyan Trinkle <ryan.trinkle@gmail.com> dateTue 13 Jun 2017, 20:45 (9 years ago) parentf1d04c250305c7
2 files changed+9
compare with develop
unifiedsplit
src/Reflex/EventWriter.hs+6 src/Reflex/Query/Base.hs+3
src/Reflex/EventWriter.hs+6
@@ -25,6 +25,7 @@ import Reflex.Class
2525import Reflex.Host.Class
2626import Reflex.PerformEvent.Class
2727import Reflex.PostBuild.Class
28+import Reflex.Query.Class
2829import Reflex.Requester.Class
2930import Reflex.TriggerEvent.Class
3031
@@ -170,3 +171,8 @@ instance MonadAtomicRef m => MonadAtomicRef (EventWriterT t w m) where
170171instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (EventWriterT t w m) where
171172 newEventWithTrigger = lift . newEventWithTrigger
172173 newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
174+
175+instance (MonadQuery t q m, Monad m) => MonadQuery t q (EventWriterT t w m) where
176+ tellQueryIncremental = lift . tellQueryIncremental
177+ askQueryResult = lift askQueryResult
178+ queryIncremental = lift . queryIncremental
src/Reflex/Query/Base.hs+3
@@ -269,3 +269,6 @@ instance Requester t m => Requester t (QueryT t q m) where
269269 type Request (QueryT t q m) = Request m
270270 type Response (QueryT t q m) = Response m
271271 withRequesting f = QueryT $ withRequesting $ unQueryT . f
272+
273+instance EventWriter t w m => EventWriter t w (QueryT t q m) where
274+ tellEvent = lift . tellEvent