b121038 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Remove unnecessary runJSM

commitb121038863899d7205ab5cbbfbd21bda3979d5b0 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateSat 15 Oct 2016, 13:28 (10 years ago) parent2499675

2 files changed+4−5

compare with develop

unifiedsplit

src/Reflex/Dom/Old.hs+1−2 src/Reflex/Dom/Widget/Resize.hs+3−3

src/Reflex/Dom/Old.hs+1−2

@@ -278,8 +278,7 @@ elDynHtmlAttr' elementTag attrs html = do

278278 let cfg = def & initialAttributes .~ Map.mapKeys (AttributeName Nothing) attrs

279279 (e, _) <- element elementTag cfg $ return ()

280280 postBuild <- getPostBuild

281− ctx <- askJSM

282− performEvent_ $ (`runJSM` ctx) . Element.setInnerHTML (_element_raw e) . Just <$> leftmost [updated html, tag (current html) postBuild]

281+ performEvent_ $ liftJSM . Element.setInnerHTML (_element_raw e) . Just <$> leftmost [updated html, tag (current html) postBuild]

283282 return e

284283

285284elDynHtml' :: MonadWidget t m => Text -> Dynamic t Text -> m (Element EventResult GhcjsDomSpace t)

src/Reflex/Dom/Widget/Resize.hs+3−3

@@ -24,7 +24,7 @@ import Data.Text (Text)

2424import qualified Data.Text as T

2525import GHCJS.DOM.Element hiding (reset)

2626import GHCJS.DOM.EventM (on)

27−import GHCJS.DOM.Types (runJSM, askJSM, MonadJSM)

27+import GHCJS.DOM.Types (runJSM, askJSM, liftJSM, MonadJSM)

2828

2929-- | A widget that wraps the given widget in a div and fires an event when resized.

3030-- Adapted from github.com/marcj/css-element-queries

@@ -76,10 +76,10 @@ resizeDetectorWithAttrs attrs w = do

7676 then return Nothing

7777 else fmap Just reset

7878 pb <- getPostBuild

79− ctx <- askJSM

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

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

82− size0 <- performEvent $ fmap (const $ runJSM reset ctx) pb

81+ size0 <- performEvent $ fmap (const $ liftJSM reset) pb

82+ ctx <- askJSM

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

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

8585 return (fmapMaybe void resize, w')