1bb428b · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Re-add the commented-out EventNames

commit1bb428ba06e328e4b3b0057b682ce637bab088ef authorRyan Trinkle <ryan.trinkle@gmail.com> dateTue 9 Aug 2016, 17:44 (10 years ago) parentbfc7192

3 files changed+17−39

compare with develop

unifiedsplit

src/Reflex/Dom/Builder/Class/Events.hs+3−9 src/Reflex/Dom/Builder/Immediate.hs+12−24 src/Reflex/Dom/Widget/Input.hs+2−6

src/Reflex/Dom/Builder/Class/Events.hs+3−9

@@ -42,17 +42,15 @@ data EventTag

4242 | SelectTag

4343 | SubmitTag

4444 | WheelTag

45− {-

4645 | BeforecutTag

4746 | CutTag

4847 | BeforecopyTag

4948 | CopyTag

5049 | BeforepasteTag

5150 | PasteTag

52−-}

5351 | ResetTag

5452 | SearchTag

55−-- | SelectstartTag

53+ | SelectstartTag

5654 | TouchstartTag

5755 | TouchmoveTag

5856 | TouchendTag

@@ -92,17 +90,15 @@ data EventName :: EventTag -> * where

9290 Select :: EventName 'SelectTag

9391 Submit :: EventName 'SubmitTag

9492 Wheel :: EventName 'WheelTag

95− {-

9693 Beforecut :: EventName 'BeforecutTag

9794 Cut :: EventName 'CutTag

9895 Beforecopy :: EventName 'BeforecopyTag

9996 Copy :: EventName 'CopyTag

10097 Beforepaste :: EventName 'BeforepasteTag

10198 Paste :: EventName 'PasteTag

102−-}

10399 Reset :: EventName 'ResetTag

104100 Search :: EventName 'SearchTag

105−-- Selectstart :: EventName 'SelectstartTag

101+ Selectstart :: EventName 'SelectstartTag

106102 Touchstart :: EventName 'TouchstartTag

107103 Touchmove :: EventName 'TouchmoveTag

108104 Touchend :: EventName 'TouchendTag

@@ -143,17 +139,15 @@ type family EventResultType (en :: EventTag) :: * where

143139 EventResultType 'MousewheelTag = ()

144140 EventResultType 'SelectTag = ()

145141 EventResultType 'SubmitTag = ()

146− {-

147142 EventResultType 'BeforecutTag = ()

148143 EventResultType 'CutTag = ()

149144 EventResultType 'BeforecopyTag = ()

150145 EventResultType 'CopyTag = ()

151146 EventResultType 'BeforepasteTag = ()

152147 EventResultType 'PasteTag = ()

153−-}

154148 EventResultType 'ResetTag = ()

155149 EventResultType 'SearchTag = ()

156−-- EventResultType 'SelectstartTag = ()

150+ EventResultType 'SelectstartTag = ()

157151 EventResultType 'TouchstartTag = ()

158152 EventResultType 'TouchmoveTag = ()

159153 EventResultType 'TouchendTag = ()

src/Reflex/Dom/Builder/Immediate.hs+12−24

@@ -425,17 +425,15 @@ type family EventType en where

425425 EventType 'SelectTag = UIEvent

426426 EventType 'SubmitTag = DOM.Event

427427 EventType 'WheelTag = WheelEvent

428− {-

429428 EventType 'BeforecutTag = DOM.Event

430429 EventType 'CutTag = DOM.Event

431430 EventType 'BeforecopyTag = DOM.Event

432431 EventType 'CopyTag = DOM.Event

433432 EventType 'BeforepasteTag = DOM.Event

434433 EventType 'PasteTag = DOM.Event

435−-}

436434 EventType 'ResetTag = DOM.Event

437435 EventType 'SearchTag = DOM.Event

438−-- EventType 'SelectstartTag = DOM.Event

436+ EventType 'SelectstartTag = DOM.Event

439437 EventType 'TouchstartTag = TouchEvent

440438 EventType 'TouchmoveTag = TouchEvent

441439 EventType 'TouchendTag = TouchEvent

@@ -475,17 +473,15 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of

475473 Mouseover -> return ()

476474 Select -> return ()

477475 Submit -> return ()

478− {-

479476 Beforecut -> return ()

480477 Cut -> return ()

481478 Beforecopy -> return ()

482479 Copy -> return ()

483480 Beforepaste -> return ()

484481 Paste -> return ()

485−-}

486482 Reset -> return ()

487483 Search -> return ()

488−-- Selectstart -> return ()

484+ Selectstart -> return ()

489485 Touchstart -> return ()

490486 Touchmove -> return ()

491487 Touchend -> return ()

@@ -527,17 +523,15 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of

527523 Mouseover -> return ()

528524 Select -> return ()

529525 Submit -> return ()

530− {-

531526 Beforecut -> return ()

532527 Cut -> return ()

533528 Beforecopy -> return ()

534529 Copy -> return ()

535530 Beforepaste -> return ()

536531 Paste -> return ()

537−-}

538532 Reset -> return ()

539533 Search -> return ()

540−-- Selectstart -> return ()

534+ Selectstart -> return ()

541535 Touchstart -> return ()

542536 Touchmove -> return ()

543537 Touchend -> return ()

@@ -579,17 +573,15 @@ withIsEvent en r = case en of

579573 Mouseover -> r

580574 Select -> r

581575 Submit -> r

582− {-

583576 Beforecut -> r

584577 Cut -> r

585578 Beforecopy -> r

586579 Copy -> r

587580 Beforepaste -> r

588581 Paste -> r

589−-}

590582 Reset -> r

591583 Search -> r

592−-- Selectstart -> r

584+ Selectstart -> r

593585 Touchstart -> r

594586 Touchmove -> r

595587 Touchend -> r

@@ -633,17 +625,15 @@ elementOnEventName en e = case en of

633625 Select -> on e Element.select

634626 Submit -> on e Element.submit

635627 Wheel -> on e Element.wheel

636− {-

637628 Beforecut -> on e Element.beforeCut

638629 Cut -> on e Element.cut

639630 Beforecopy -> on e Element.beforeCopy

640631 Copy -> on e Element.copy

641632 Beforepaste -> on e Element.beforePaste

642633 Paste -> on e Element.paste

643−-}

644634 Reset -> on e Element.reset

645635 Search -> on e Element.search

646−-- Selectstart -> on e Element.selectStart

636+ Selectstart -> on e Element.selectStart

647637 Touchstart -> on e Element.touchStart

648638 Touchmove -> on e Element.touchMove

649639 Touchend -> on e Element.touchEnd

@@ -685,17 +675,15 @@ windowOnEventName en e = case en of

685675 Select -> on e Window.select

686676 Submit -> on e Window.submit

687677 Wheel -> on e Window.wheel

688− {-

689− Beforecut -> on e Window.beforeCut

690− Cut -> on e Window.cut

691− Beforecopy -> on e Window.beforeCopy

692− Copy -> on e Window.copy

693− Beforepaste -> on e Window.beforePaste

694− Paste -> on e Window.paste

695−-}

678+ Beforecut -> const $ return $ return () --TODO

679+ Cut -> const $ return $ return () --TODO

680+ Beforecopy -> const $ return $ return () --TODO

681+ Copy -> const $ return $ return () --TODO

682+ Beforepaste -> const $ return $ return () --TODO

683+ Paste -> const $ return $ return () --TODO

696684 Reset -> on e Window.reset

697685 Search -> on e Window.search

698−-- Selectstart -> on e Window.selectStart

686+ Selectstart -> const $ return $ return () --TODO

699687 Touchstart -> on e Window.touchStart

700688 Touchmove -> on e Window.touchMove

701689 Touchend -> on e Window.touchEnd

src/Reflex/Dom/Widget/Input.hs+2−6

@@ -248,17 +248,15 @@ regularToCheckboxViewEventType en r = case en of

248248 Select -> r

249249 Submit -> r

250250 Wheel -> r

251− {-

252251 Beforecut -> r

253252 Cut -> r

254253 Beforecopy -> r

255254 Copy -> r

256255 Beforepaste -> r

257256 Paste -> r

258−-}

259257 Reset -> r

260258 Search -> r

261−-- Selectstart -> r

259+ Selectstart -> r

262260 Touchstart -> r

263261 Touchmove -> r

264262 Touchend -> r

@@ -392,17 +390,15 @@ regularToDropdownViewEventType en r = case en of

392390 Select -> r

393391 Submit -> r

394392 Wheel -> r

395− {-

396393 Beforecut -> r

397394 Cut -> r

398395 Beforecopy -> r

399396 Copy -> r

400397 Beforepaste -> r

401398 Paste -> r

402−-}

403399 Reset -> r

404400 Search -> r

405−-- Selectstart -> r

401+ Selectstart -> r

406402 Touchstart -> r

407403 Touchmove -> r

408404 Touchend -> r