git.iko.soy/reflex-dom
on develop help sign in
Merge pull request #101 from dc25/develop
ff66767Ryan Trinkle
src/Reflex/Dom/Builder/Immediate.hs+3−3
compare with develop
unifiedsplit
@@ -171,11 +171,11 @@ wrap e cfg = do
171 return $ Element es e
171 return $ Element es e
172
172
173{-# INLINABLE makeElement #-}
173{-# INLINABLE makeElement #-}
174−makeElement :: forall er t m a. SupportsImmediateDomBuilder t m => Text -> ElementConfig er t (ImmediateDomBuilderT t m) -> ImmediateDomBuilderT t m a -> ImmediateDomBuilderT t m ((Element er GhcjsDomSpace t, a), DOM.HTMLElement)
174+makeElement :: forall er t m a. SupportsImmediateDomBuilder t m => Text -> ElementConfig er t (ImmediateDomBuilderT t m) -> ImmediateDomBuilderT t m a -> ImmediateDomBuilderT t m ((Element er GhcjsDomSpace t, a), DOM.Element)
175makeElement elementTag cfg child = do
175makeElement elementTag cfg child = do
176 doc <- askDocument
176 doc <- askDocument
177 events <- askEvents
177 events <- askEvents
178− Just e <- ImmediateDomBuilderT $ fmap DOM.castToHTMLElement <$> case cfg ^. namespace of
178+ Just e <- ImmediateDomBuilderT $ fmap DOM.castToElement <$> case cfg ^. namespace of
179 Nothing -> createElement doc (Just elementTag)
179 Nothing -> createElement doc (Just elementTag)
180 Just ens -> createElementNS doc (Just ens) (Just elementTag)
180 Just ens -> createElementNS doc (Just ens) (Just elementTag)
181 ImmediateDomBuilderT $ iforM_ (cfg ^. initialAttributes) $ \(AttributeName mAttrNamespace n) v -> case mAttrNamespace of
181 ImmediateDomBuilderT $ iforM_ (cfg ^. initialAttributes) $ \(AttributeName mAttrNamespace n) v -> case mAttrNamespace of
@@ -201,7 +201,7 @@ data GhcjsDomSpace
201instance DomSpace GhcjsDomSpace where
201instance DomSpace GhcjsDomSpace where
202 type EventSpec GhcjsDomSpace = GhcjsEventSpec
202 type EventSpec GhcjsDomSpace = GhcjsEventSpec
203 type RawTextNode GhcjsDomSpace = DOM.Text
203 type RawTextNode GhcjsDomSpace = DOM.Text
204− type RawElement GhcjsDomSpace = DOM.HTMLElement
204+ type RawElement GhcjsDomSpace = DOM.Element
205 type RawFile GhcjsDomSpace = DOM.File
205 type RawFile GhcjsDomSpace = DOM.File
206 type RawInputElement GhcjsDomSpace = DOM.HTMLInputElement
206 type RawInputElement GhcjsDomSpace = DOM.HTMLInputElement
207 type RawTextAreaElement GhcjsDomSpace = DOM.HTMLTextAreaElement
207 type RawTextAreaElement GhcjsDomSpace = DOM.HTMLTextAreaElement
src/Reflex/Dom/Old.hs+2−2
@@ -217,7 +217,7 @@ _el_keypress = domEvent Keypress
217_el_scrolled :: Reflex t => El t -> Event t Int
217_el_scrolled :: Reflex t => El t -> Event t Int
218_el_scrolled = domEvent Scroll
218_el_scrolled = domEvent Scroll
219
219
220−wrapElement :: forall t m. MonadWidget t m => (forall en. DOM.HTMLElement -> EventName en -> EventM DOM.Element (EventType en) (Maybe (EventResult en))) -> DOM.HTMLElement -> m (El t)
220+wrapElement :: forall t m. MonadWidget t m => (forall en. DOM.Element -> EventName en -> EventM DOM.Element (EventType en) (Maybe (EventResult en))) -> DOM.Element -> m (El t)
221wrapElement eh e = do
221wrapElement eh e = do
222 let h :: (EventName en, GhcjsDomEvent en) -> IO (Maybe (EventResult en))
222 let h :: (EventName en, GhcjsDomEvent en) -> IO (Maybe (EventResult en))
223 h (en, GhcjsDomEvent evt) = runReaderT (eh e en) evt
223 h (en, GhcjsDomEvent evt) = runReaderT (eh e en) evt
@@ -227,7 +227,7 @@ wrapElement eh e = do
227 }
227 }
228 }
228 }
229
229
230−unsafePlaceElement :: MonadWidget t m => DOM.HTMLElement -> m (Element EventResult (DomBuilderSpace m) t)
230+unsafePlaceElement :: MonadWidget t m => DOM.Element -> m (Element EventResult (DomBuilderSpace m) t)
231unsafePlaceElement e = do
231unsafePlaceElement e = do
232 placeRawElement e
232 placeRawElement e
233 wrapRawElement e def
233 wrapRawElement e def