3041a0b · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Merge remote-tracking branch 'origin/primmonad-instances-for-all-builders' into placeholder-refactor

commit3041a0b8d457ceabe6b169a2faa021403ab02d96 authorRyan Trinkle <ryan.trinkle@gmail.com> dateTue 1 Nov 2016, 19:47 (10 years ago) parentc0336df 5f626cd

2 files changed+3−3

compare with develop

unifiedsplit

src/Reflex/Dom/Builder/Class/Events.hs+1−1 src/Reflex/Dom/Builder/Immediate.hs+2−2

src/Reflex/Dom/Builder/Class/Events.hs+1−1

@@ -108,7 +108,7 @@ newtype EventResult en = EventResult { unEventResult :: EventResultType en }

108108

109109type family EventResultType (en :: EventTag) :: * where

110110 EventResultType 'ClickTag = ()

111− EventResultType 'DblclickTag = ()

111+ EventResultType 'DblclickTag = (Int, Int)

112112 EventResultType 'KeypressTag = Int

113113 EventResultType 'KeydownTag = Int

114114 EventResultType 'KeyupTag = Int

src/Reflex/Dom/Builder/Immediate.hs+2−2

@@ -550,7 +550,7 @@ type family EventType en where

550550defaultDomEventHandler :: IsElement e => e -> EventName en -> EventM e (EventType en) (Maybe (EventResult en))

551551defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of

552552 Click -> return ()

553− Dblclick -> return ()

553+ Dblclick -> getMouseEventCoords

554554 Keypress -> getKeyEvent

555555 Scroll -> getScrollTop e

556556 Keydown -> getKeyEvent

@@ -600,7 +600,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of

600600defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))

601601defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of

602602 Click -> return ()

603− Dblclick -> return ()

603+ Dblclick -> getMouseEventCoords

604604 Keypress -> getKeyEvent

605605 Scroll -> Window.getScrollY w

606606 Keydown -> getKeyEvent