a903490 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Tweak deprecation warnings; deprecate _el_element and _el_events

commita9034906bd25402defcb51aac7d4d973a23d9b79 authorRyan Trinkle <ryan.trinkle@gmail.com> dateTue 9 Aug 2016, 07:45 (10 years ago) parente46e772

2 files changed+14−13

compare with develop

unifiedsplit

src/Reflex/Dom/Old.hs+5−3 src/Reflex/Dom/Widget/Resize.hs+9−10

src/Reflex/Dom/Old.hs+5−3

@@ -174,20 +174,22 @@ emptyElWith elementTag cfg = void $ emptyElWith' elementTag cfg

174174emptyElWith' :: (MonadWidget t m, Attributes m attrs t) => Text -> ElConfig attrs -> m (Element EventResult (DomBuilderSpace m) t)

175175emptyElWith' elementTag cfg = liftM fst $ elWith' elementTag cfg $ return ()

176176

177−{-# DEPRECATED _el_clicked "Use `domEvent Click` instead" #-}

177+{-# DEPRECATED _el_clicked "Use 'domEvent Click' instead" #-}

178178_el_clicked :: Reflex t => Element EventResult d t -> Event t ()

179179_el_clicked = domEvent Click

180180

181+{-# DEPRECATED _el_element "Use '_element_raw' instead" #-}

181182_el_element :: El t -> RawElement GhcjsDomSpace

182183_el_element = _element_raw

183184

185+{-# DEPRECATED _el_events "Use '_element_events' instead; or, if possible, use 'domEvent' instead to retrieve a particular event" #-}

184186_el_events :: Element er d t -> EventSelector t (WrapArg er EventName)

185187_el_events = _element_events

186188

187−{-# DEPRECATED _el_keypress "Use `domEvent Keypress` instead" #-}

189+{-# DEPRECATED _el_keypress "Use 'domEvent Keypress' instead" #-}

188190_el_keypress :: Reflex t => El t -> Event t Int

189191_el_keypress = domEvent Keypress

190192

191−{-# DEPRECATED _el_scrolled "Use `domEvent Scroll` instead" #-}

193+{-# DEPRECATED _el_scrolled "Use 'domEvent Scroll' instead" #-}

192194_el_scrolled :: Reflex t => El t -> Event t Int

193195_el_scrolled = domEvent Scroll

src/Reflex/Dom/Widget/Resize.hs+9−10

@@ -9,7 +9,6 @@ import Reflex

99import Reflex.Dom.Builder.Class

1010import Reflex.Dom.Builder.Immediate

1111import Reflex.Dom.Class

12−import Reflex.Dom.Old

1312import Reflex.Dom.PerformEvent.Class

1413import Reflex.Dom.PostBuild.Class

1514import Reflex.Dom.Widget.Basic

@@ -50,13 +49,13 @@ resizeDetectorWithAttrs attrs w = do

5049 (shrink, _) <- elAttr' "div" containerAttrs $ elAttr "div" ("style" =: (childStyle <> "width: 200%; height: 200%;")) $ return ()

5150 return (expand, expandChild, shrink, w')

5251 let reset = do

53− let e = _el_element expand

54− s = _el_element shrink

52+ let e = _element_raw expand

53+ s = _element_raw shrink

5554 eow <- getOffsetWidth e

5655 eoh <- getOffsetHeight e

5756 let ecw = eow + 10

5857 ech = eoh + 10

59− setAttribute (_el_element expandChild) ("style" :: Text) (childStyle <> "width: " <> T.pack (show ecw) <> "px;" <> "height: " <> T.pack (show ech) <> "px;")

58+ setAttribute (_element_raw expandChild) ("style" :: Text) (childStyle <> "width: " <> T.pack (show ecw) <> "px;" <> "height: " <> T.pack (show ech) <> "px;")

6059 esw <- getScrollWidth e

6160 setScrollLeft e esw

6261 esh <- getScrollHeight e

@@ -65,18 +64,18 @@ resizeDetectorWithAttrs attrs w = do

6564 setScrollLeft s ssw

6665 ssh <- getScrollHeight s

6766 setScrollTop s ssh

68− lastWidth <- getOffsetWidth (_el_element parent)

69− lastHeight <- getOffsetHeight (_el_element parent)

67+ lastWidth <- getOffsetWidth (_element_raw parent)

68+ lastHeight <- getOffsetHeight (_element_raw parent)

7069 return (Just lastWidth, Just lastHeight)

7170 resetIfChanged ds = do

72− pow <- getOffsetWidth (_el_element parent)

73− poh <- getOffsetHeight (_el_element parent)

71+ pow <- getOffsetWidth (_element_raw parent)

72+ poh <- getOffsetHeight (_element_raw parent)

7473 if ds == (Just pow, Just poh)

7574 then return Nothing

7675 else fmap Just reset

7776 pb <- getPostBuild

78− expandScroll <- wrapDomEvent (_el_element expand) (`on` scroll) $ return ()

79− shrinkScroll <- wrapDomEvent (_el_element shrink) (`on` scroll) $ return ()

77+ expandScroll <- wrapDomEvent (_element_raw expand) (`on` scroll) $ return ()

78+ shrinkScroll <- wrapDomEvent (_element_raw shrink) (`on` scroll) $ return ()

8079 size0 <- performEvent $ fmap (const $ liftIO reset) pb

8180 rec resize <- performEventAsync $ fmap (\d cb -> liftIO $ cb =<< resetIfChanged d) $ tag (current dimensions) $ leftmost [expandScroll, shrinkScroll]

8281 dimensions <- holdDyn (Nothing, Nothing) $ leftmost [ size0, fmapMaybe id resize ]