ff66767 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Merge pull request #101 from dc25/develop

replaced HTMLElement with Element as needed

commitff667679ea7d0ccbe31b2a1a74c929990a85027f authorRyan Trinkle <ryan.trinkle@gmail.com> dateTue 4 Oct 2016, 10:54 (10 years ago) parent9af728b 8a9f322

2 files changed+5−5

compare with develop

unifiedsplit

src/Reflex/Dom/Builder/Immediate.hs+3−3 src/Reflex/Dom/Old.hs+2−2

src/Reflex/Dom/Builder/Immediate.hs+3−3

@@ -171,11 +171,11 @@ wrap e cfg = do

171171 return $ Element es e

172172

173173{-# 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)

175175makeElement elementTag cfg child = do

176176 doc <- askDocument

177177 events <- askEvents

178− Just e <- ImmediateDomBuilderT $ fmap DOM.castToHTMLElement <$> case cfg ^. namespace of

178+ Just e <- ImmediateDomBuilderT $ fmap DOM.castToElement <$> case cfg ^. namespace of

179179 Nothing -> createElement doc (Just elementTag)

180180 Just ens -> createElementNS doc (Just ens) (Just elementTag)

181181 ImmediateDomBuilderT $ iforM_ (cfg ^. initialAttributes) $ \(AttributeName mAttrNamespace n) v -> case mAttrNamespace of

@@ -201,7 +201,7 @@ data GhcjsDomSpace

201201instance DomSpace GhcjsDomSpace where

202202 type EventSpec GhcjsDomSpace = GhcjsEventSpec

203203 type RawTextNode GhcjsDomSpace = DOM.Text

204− type RawElement GhcjsDomSpace = DOM.HTMLElement

204+ type RawElement GhcjsDomSpace = DOM.Element

205205 type RawFile GhcjsDomSpace = DOM.File

206206 type RawInputElement GhcjsDomSpace = DOM.HTMLInputElement

207207 type RawTextAreaElement GhcjsDomSpace = DOM.HTMLTextAreaElement

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

@@ -217,7 +217,7 @@ _el_keypress = domEvent Keypress

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

218218_el_scrolled = domEvent Scroll

219219

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)

221221wrapElement eh e = do

222222 let h :: (EventName en, GhcjsDomEvent en) -> IO (Maybe (EventResult en))

223223 h (en, GhcjsDomEvent evt) = runReaderT (eh e en) evt

@@ -227,7 +227,7 @@ wrapElement eh e = do

227227 }

228228 }

229229

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)

231231unsafePlaceElement e = do

232232 placeRawElement e

233233 wrapRawElement e def