d6f452b · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

merge with TickInfo derived classes

commitd6f452b8bd3a28aaf8395f08bf58fb688fa87104 authorGreg Hale <imalsogreg@gmail.com> dateMon 25 May 2015, 08:39 (11 years ago) parent93cd045 e9c9e12

3 files changed+6−2

compare with develop

unifiedsplit

src-ghc/Reflex/Dom/Internal/Foreign.hs−1 src/Reflex/Dom/Time.hs+2−1 src/Reflex/Dom/Xhr.hs+4

src-ghc/Reflex/Dom/Internal/Foreign.hs−1

@@ -35,7 +35,6 @@ makeDefaultWebView userAgentKey main = do

3535 main webView

3636 wf <- webViewGetMainFrame webView

3737 webFrameLoadString wf "" Nothing "file:///"

38− main webView

3938 mainGUI

4039

4140runWebGUI :: (WebView -> IO ()) -> IO ()

src/Reflex/Dom/Time.hs+2−1

@@ -12,6 +12,7 @@ import Control.Monad.IO.Class

1212import Data.Fixed

1313import Data.Time.Clock

1414import System.Random

15+import Data.Typeable

1516

1617data TickInfo

1718 = TickInfo { _tickInfo_lastUTC :: UTCTime

@@ -21,7 +22,7 @@ data TickInfo

2122 , _tickInfo_alreadyElapsed :: NominalDiffTime

2223 -- ^ Amount of time already elapsed in the current tick period.

2324 }

24− deriving (Eq, Show)

25+ deriving (Eq, Ord, Show, Typeable)

2526

2627-- | Special case of tickLossyFrom that uses the post-build event to start the

2728-- tick thread.

src/Reflex/Dom/Xhr.hs+4

@@ -31,12 +31,14 @@ import Data.Traversable

3131import Reflex

3232import Reflex.Dom.Class

3333import Reflex.Dom.Xhr.Foreign

34+import Data.Typeable

3435

3536data XhrRequest

3637 = XhrRequest { _xhrRequest_method :: String

3738 , _xhrRequest_url :: String

3839 , _xhrRequest_config :: XhrRequestConfig

3940 }

41+ deriving (Show, Read, Eq, Ord, Typeable)

4042

4143data XhrRequestConfig

4244 = XhrRequestConfig { _xhrRequestConfig_headers :: Map String String

@@ -45,10 +47,12 @@ data XhrRequestConfig

4547 , _xhrRequestConfig_responseType :: Maybe String

4648 , _xhrRequestConfig_sendData :: Maybe String

4749 }

50+ deriving (Show, Read, Eq, Ord, Typeable)

4851

4952data XhrResponse

5053 = XhrResponse { _xhrResponse_body :: Maybe Text

5154 }

55+ deriving (Show, Read, Eq, Ord, Typeable)

5256

5357instance Default XhrRequestConfig where

5458 def = XhrRequestConfig { _xhrRequestConfig_headers = Map.empty