a00be61 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Merge branch 'refactor' of github.com:reflex-frp/reflex-dom into refactor

commita00be613aa82ce19978e62b66b322a5aa444cdaf authorRyan Trinkle <ryan.trinkle@gmail.com> dateSat 16 Jul 2016, 13:39 (10 years ago) parentd31c93c cbe1056

2 files changed+9−6

compare with develop

unifiedsplit

src/Reflex/Dom/Widget/Resize.hs+5−3 src/Reflex/Dom/Xhr.hs+4−3

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

@@ -4,12 +4,14 @@ module Reflex.Dom.Widget.Resize where

44import Reflex

55import Reflex.Dom.PostBuild.Class

66import Reflex.Dom.PerformEvent.Class

7+import Reflex.Dom.Builder.Class

78import Reflex.Dom.Builder.Immediate

89import Reflex.Dom.Class

910import Reflex.Dom.Old

1011import Reflex.Dom.Widget.Basic

1112

1213import Control.Monad

14+import Control.Monad.Fix

1315import Control.Monad.IO.Class

1416import Data.Map (Map)

1517import Data.Text (Text)

@@ -21,16 +23,16 @@ import qualified Data.Map as Map

2123

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

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

24−resizeDetector :: MonadWidget t m => m a -> m (Event t (), a)

26+resizeDetector :: (DomBuilder t m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, DomBuilderSpace m ~ GhcjsDomSpace, MonadIO (Performable m), MonadIO m, MonadFix m) => m a -> m (Event t (), a)

2527resizeDetector = resizeDetectorWithStyle ""

2628

27−resizeDetectorWithStyle :: MonadWidget t m

29+resizeDetectorWithStyle :: (DomBuilder t m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, DomBuilderSpace m ~ GhcjsDomSpace, MonadIO (Performable m), MonadIO m, MonadFix m)

2830 => Text -- ^ A css style string. Warning: It should not contain the "position" style attribute.

2931 -> m a -- ^ The embedded widget

3032 -> m (Event t (), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget

3133resizeDetectorWithStyle styleString w = resizeDetectorWithAttrs ("style" =: styleString) w

3234

33−resizeDetectorWithAttrs :: MonadWidget t m

35+resizeDetectorWithAttrs :: (DomBuilder t m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, DomBuilderSpace m ~ GhcjsDomSpace, MonadIO (Performable m), MonadIO m, MonadFix m)

3436 => Map Text Text -- ^ A map of attributes. Warning: It should not modify the "position" style attribute.

3537 -> m a -- ^ The embedded widget

3638 -> m (Event t (), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget

src/Reflex/Dom/Xhr.hs+4−3

@@ -1,4 +1,4 @@

1−{-# LANGUAGE TemplateHaskell, GADTs, DeriveDataTypeable, FlexibleContexts, OverloadedStrings #-}

1+{-# LANGUAGE TemplateHaskell, GADTs, DeriveDataTypeable, DeriveFunctor, FlexibleContexts, OverloadedStrings #-}

22module Reflex.Dom.Xhr

33 ( XMLHttpRequest

44 , XhrRequest(..)

@@ -80,7 +80,7 @@ data XhrRequest a

8080 , _xhrRequest_url :: Text

8181 , _xhrRequest_config :: XhrRequestConfig a

8282 }

83− deriving (Show, Read, Eq, Ord, Typeable)

83+ deriving (Show, Read, Eq, Ord, Typeable, Functor)

8484

8585data XhrRequestConfig a

8686 = XhrRequestConfig { _xhrRequestConfig_headers :: Map Text Text

@@ -89,7 +89,7 @@ data XhrRequestConfig a

8989 , _xhrRequestConfig_responseType :: Maybe XhrResponseType

9090 , _xhrRequestConfig_sendData :: a

9191 }

92− deriving (Show, Read, Eq, Ord, Typeable)

92+ deriving (Show, Read, Eq, Ord, Typeable, Functor)

9393

9494data XhrResponse

9595 = XhrResponse { _xhrResponse_status :: Word

@@ -261,3 +261,4 @@ liftM concat $ mapM makeLenses

261261 , ''XhrRequestConfig

262262 , ''XhrResponse

263263 ]

264+