on develop help sign in
Merge remote-tracking branch 'origin/primmonad-instances-for-all-builders' into placeholder-refactor
3041a0bRyan Trinkle
src/Reflex/Dom/Builder/Class/Events.hs+1−1
@@ -108,7 +108,7 @@ newtype EventResult en = EventResult { unEventResult :: EventResultType en }
108
108
109type family EventResultType (en :: EventTag) :: * where
109type family EventResultType (en :: EventTag) :: * where
110 EventResultType 'ClickTag = ()
110 EventResultType 'ClickTag = ()
111− EventResultType 'DblclickTag = ()
111+ EventResultType 'DblclickTag = (Int, Int)
112 EventResultType 'KeypressTag = Int
112 EventResultType 'KeypressTag = Int
113 EventResultType 'KeydownTag = Int
113 EventResultType 'KeydownTag = Int
114 EventResultType 'KeyupTag = Int
114 EventResultType 'KeyupTag = Int
src/Reflex/Dom/Builder/Immediate.hs+2−2
@@ -550,7 +550,7 @@ type family EventType en where
550defaultDomEventHandler :: IsElement e => e -> EventName en -> EventM e (EventType en) (Maybe (EventResult en))
550defaultDomEventHandler :: IsElement e => e -> EventName en -> EventM e (EventType en) (Maybe (EventResult en))
551defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
551defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
552 Click -> return ()
552 Click -> return ()
553− Dblclick -> return ()
553+ Dblclick -> getMouseEventCoords
554 Keypress -> getKeyEvent
554 Keypress -> getKeyEvent
555 Scroll -> getScrollTop e
555 Scroll -> getScrollTop e
556 Keydown -> getKeyEvent
556 Keydown -> getKeyEvent
@@ -600,7 +600,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
600defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
600defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
601defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
601defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
602 Click -> return ()
602 Click -> return ()
603− Dblclick -> return ()
603+ Dblclick -> getMouseEventCoords
604 Keypress -> getKeyEvent
604 Keypress -> getKeyEvent
605 Scroll -> Window.getScrollY w
605 Scroll -> Window.getScrollY w
606 Keydown -> getKeyEvent
606 Keydown -> getKeyEvent