c86fee7 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Use ghcjs-dom-0.9

commitc86fee7a7d731f50aa100b32e79010dd69e11409 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateFri 2 Jun 2017, 09:47 (9 years ago) parent8826615

3 files changed+11−11

compare with develop

unifiedsplit

reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+8−8 reflex-dom-core/src/Reflex/Dom/Main.hs+2−2 reflex-dom-core/src/Reflex/Dom/Old.hs+1−1

reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+8−8

@@ -471,14 +471,14 @@ instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t

471471 inputElement cfg = do

472472 ((e, _), domElement) <- makeElement "input" (cfg ^. inputElementConfig_elementConfig) $ return ()

473473 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement

474− Input.setValue domInputElement $ Just (cfg ^. inputElementConfig_initialValue)

475− v0 <- Input.getValueUnchecked domInputElement

476− let getMyValue = fromMaybe "" <$> Input.getValue domInputElement

474+ Input.setValue domInputElement $ cfg ^. inputElementConfig_initialValue

475+ v0 <- Input.getValue domInputElement

476+ let getMyValue = Input.getValue domInputElement

477477 valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)

478478 valueChangedBySetValue <- case _inputElementConfig_setValue cfg of

479479 Nothing -> return never

480480 Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do

481− Input.setValue domInputElement $ Just v'

481+ Input.setValue domInputElement v'

482482 getMyValue -- We get the value after setting it in case the browser has mucked with it somehow

483483 v <- holdDyn v0 $ leftmost

484484 [ valueChangedBySetValue

@@ -523,14 +523,14 @@ instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t

523523 textAreaElement cfg = do --TODO

524524 ((e, _), domElement) <- makeElement "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()

525525 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement

526− TextArea.setValue domTextAreaElement $ Just (cfg ^. textAreaElementConfig_initialValue)

527− v0 <- TextArea.getValueUnchecked domTextAreaElement

528− let getMyValue = fromMaybe "" <$> TextArea.getValue domTextAreaElement

526+ TextArea.setValue domTextAreaElement $ cfg ^. textAreaElementConfig_initialValue

527+ v0 <- TextArea.getValue domTextAreaElement

528+ let getMyValue = TextArea.getValue domTextAreaElement

529529 valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)

530530 valueChangedBySetValue <- case _textAreaElementConfig_setValue cfg of

531531 Nothing -> return never

532532 Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do

533− TextArea.setValue domTextAreaElement $ Just v'

533+ TextArea.setValue domTextAreaElement v'

534534 getMyValue -- We get the value after setting it in case the browser has mucked with it somehow

535535 v <- holdDyn v0 $ leftmost

536536 [ valueChangedBySetValue

reflex-dom-core/src/Reflex/Dom/Main.hs+2−2

@@ -74,7 +74,7 @@ mainWidgetWithCss :: ByteString -> (forall x. Widget x ()) -> JSM ()

7474mainWidgetWithCss css w = withJSContextSingleton $ \jsSing -> do

7575 doc <- currentDocumentUnchecked

7676 headElement <- getHeadUnchecked doc

77− setInnerHTML headElement . Just $ "<style>" <> T.unpack (decodeUtf8 css) <> "</style>" --TODO: Fix this

77+ setInnerHTML headElement $ "<style>" <> T.unpack (decodeUtf8 css) <> "</style>" --TODO: Fix this

7878 body <- getBodyUnchecked doc

7979 attachWidget body jsSing w

8080

@@ -114,7 +114,7 @@ mainWidgetWithHead' widgets = withJSContextSingletonMono $ \jsSing -> do

114114

115115replaceElementContents :: DOM.IsElement e => e -> DOM.DocumentFragment -> JSM ()

116116replaceElementContents e df = do

117− setInnerHTML e $ Just ("" :: String)

117+ setInnerHTML e ("" :: String)

118118 _ <- appendChild e df

119119 return ()

120120

reflex-dom-core/src/Reflex/Dom/Old.hs+1−1

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

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

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

276276 postBuild <- getPostBuild

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

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

278278 return e

279279

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