git.iko.soy/reflex-dom
on develop help sign in
Use ghcjs-dom-0.9
c86fee7Hamish Mackenzie
reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+8−8
compare with develop
unifiedsplit
@@ -471,14 +471,14 @@ instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t
471 inputElement cfg = do
471 inputElement cfg = do
472 ((e, _), domElement) <- makeElement "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
472 ((e, _), domElement) <- makeElement "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
473 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
473 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
474− Input.setValue domInputElement $ Just (cfg ^. inputElementConfig_initialValue)
474+ Input.setValue domInputElement $ cfg ^. inputElementConfig_initialValue
475− v0 <- Input.getValueUnchecked domInputElement
475+ v0 <- Input.getValue domInputElement
476− let getMyValue = fromMaybe "" <$> Input.getValue domInputElement
476+ let getMyValue = Input.getValue domInputElement
477 valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
477 valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
478 valueChangedBySetValue <- case _inputElementConfig_setValue cfg of
478 valueChangedBySetValue <- case _inputElementConfig_setValue cfg of
479 Nothing -> return never
479 Nothing -> return never
480 Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
480 Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
481− Input.setValue domInputElement $ Just v'
481+ Input.setValue domInputElement v'
482 getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
482 getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
483 v <- holdDyn v0 $ leftmost
483 v <- holdDyn v0 $ leftmost
484 [ valueChangedBySetValue
484 [ valueChangedBySetValue
@@ -523,14 +523,14 @@ instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t
523 textAreaElement cfg = do --TODO
523 textAreaElement cfg = do --TODO
524 ((e, _), domElement) <- makeElement "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
524 ((e, _), domElement) <- makeElement "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
525 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
525 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
526− TextArea.setValue domTextAreaElement $ Just (cfg ^. textAreaElementConfig_initialValue)
526+ TextArea.setValue domTextAreaElement $ cfg ^. textAreaElementConfig_initialValue
527− v0 <- TextArea.getValueUnchecked domTextAreaElement
527+ v0 <- TextArea.getValue domTextAreaElement
528− let getMyValue = fromMaybe "" <$> TextArea.getValue domTextAreaElement
528+ let getMyValue = TextArea.getValue domTextAreaElement
529 valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
529 valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
530 valueChangedBySetValue <- case _textAreaElementConfig_setValue cfg of
530 valueChangedBySetValue <- case _textAreaElementConfig_setValue cfg of
531 Nothing -> return never
531 Nothing -> return never
532 Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
532 Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
533− TextArea.setValue domTextAreaElement $ Just v'
533+ TextArea.setValue domTextAreaElement v'
534 getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
534 getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
535 v <- holdDyn v0 $ leftmost
535 v <- holdDyn v0 $ leftmost
536 [ valueChangedBySetValue
536 [ valueChangedBySetValue
reflex-dom-core/src/Reflex/Dom/Main.hs+2−2
@@ -74,7 +74,7 @@ mainWidgetWithCss :: ByteString -> (forall x. Widget x ()) -> JSM ()
74mainWidgetWithCss css w = withJSContextSingleton $ \jsSing -> do
74mainWidgetWithCss css w = withJSContextSingleton $ \jsSing -> do
75 doc <- currentDocumentUnchecked
75 doc <- currentDocumentUnchecked
76 headElement <- getHeadUnchecked doc
76 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
78 body <- getBodyUnchecked doc
78 body <- getBodyUnchecked doc
79 attachWidget body jsSing w
79 attachWidget body jsSing w
80
80
@@ -114,7 +114,7 @@ mainWidgetWithHead' widgets = withJSContextSingletonMono $ \jsSing -> do
114
114
115replaceElementContents :: DOM.IsElement e => e -> DOM.DocumentFragment -> JSM ()
115replaceElementContents :: DOM.IsElement e => e -> DOM.DocumentFragment -> JSM ()
116replaceElementContents e df = do
116replaceElementContents e df = do
117− setInnerHTML e $ Just ("" :: String)
117+ setInnerHTML e ("" :: String)
118 _ <- appendChild e df
118 _ <- appendChild e df
119 return ()
119 return ()
120
120
reflex-dom-core/src/Reflex/Dom/Old.hs+1−1
@@ -274,7 +274,7 @@ elDynHtmlAttr' elementTag attrs html = do
274 let cfg = def & initialAttributes .~ Map.mapKeys (AttributeName Nothing) attrs
274 let cfg = def & initialAttributes .~ Map.mapKeys (AttributeName Nothing) attrs
275 (e, _) <- element elementTag cfg $ return ()
275 (e, _) <- element elementTag cfg $ return ()
276 postBuild <- getPostBuild
276 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]
278 return e
278 return e
279
279
280elDynHtml' :: MonadWidget t m => Text -> Dynamic t Text -> m (Element EventResult GhcjsDomSpace t)
280elDynHtml' :: MonadWidget t m => Text -> Dynamic t Text -> m (Element EventResult GhcjsDomSpace t)