git.iko.soy/reflex-dom
on develop help sign in
Merge remote-tracking branch 'origin/develop' into foreign-js-additions

# Conflicts: # src/Reflex/Dom/Internal.hs

commitd2bd15fe786667bbf175108c71eff56f4e5e15f8 authorRyan Trinkle <ryan.trinkle@gmail.com> dateSun 26 Jul 2015, 22:56 (11 years ago) parent30a1bea013d001
1 file changed+4−1
compare with develop
unifiedsplit
src/Reflex/Dom/Internal.hs+4−1
src/Reflex/Dom/Internal.hs+4−1
@@ -247,9 +247,12 @@ instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (WithWebView
247247 newEventWithTrigger = lift . newEventWithTrigger
248248 newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
249249
250+instance MonadSubscribeEvent t m => MonadSubscribeEvent t (WithWebView x m) where
251+ subscribeEvent = lift . subscribeEvent
252+
250253instance MonadReflexHost t m => MonadReflexHost t (WithWebView x m) where
254+ type ReadPhase (WithWebView x m) = ReadPhase m
251255 fireEventsAndRead dm a = lift $ fireEventsAndRead dm a
252− subscribeEvent = lift . subscribeEvent
253256 runHostFrame = lift . runHostFrame
254257
255258runWithWebView :: WithWebView x m a -> WebViewSingleton x -> m a