4f0eb09 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

More stylish-haskell

commit4f0eb092864c7585f988807eaa03ae11e8a9fe0f authorRyan Trinkle <ryan.trinkle@gmail.com> dateSun 17 Jul 2016, 00:03 (10 years ago) parent16c6999

6 files changed+73−40

compare with develop

unifiedsplit

src/Reflex/Dom/Class.hs+3−2 src/Reflex/Dom/Time.hs+8−3 src/Reflex/Dom/Widget/Input.hs+32−20 src/Reflex/Dom/Widget/Lazy.hs+11−6 src/Reflex/Dom/Widget/Resize.hs+9−5 src/Reflex/Dom/Xhr.hs+10−4

src/Reflex/Dom/Class.hs+3−2

@@ -1,12 +1,13 @@

1+{-# LANGUAGE MultiParamTypeClasses #-}

12module Reflex.Dom.Class ( module Reflex.Dom.Class

23 , module Foreign.JavaScript.TH

34 ) where

56import Reflex.Class

6−import Reflex.Dom.PostBuild.Class

77import Reflex.Dom.PerformEvent.Class

8+import Reflex.Dom.PostBuild.Class

9−import Prelude hiding (mapM, mapM_, sequence, concat)

10+import Prelude hiding (concat, mapM, mapM_, sequence)

1011

1112import Foreign.JavaScript.TH

1213

src/Reflex/Dom/Time.hs+8−3

@@ -1,9 +1,14 @@

1−{-# LANGUAGE DeriveDataTypeable, TypeFamilies, ScopedTypeVariables, FlexibleContexts, RecursiveDo #-}

1+{-# LANGUAGE DeriveDataTypeable #-}

2+{-# LANGUAGE FlexibleContexts #-}

3+{-# LANGUAGE MultiParamTypeClasses #-}

4+{-# LANGUAGE RecursiveDo #-}

5+{-# LANGUAGE ScopedTypeVariables #-}

6+{-# LANGUAGE TypeFamilies #-}

27module Reflex.Dom.Time where

49import Reflex

5−import Reflex.Dom.PostBuild.Class

610import Reflex.Dom.PerformEvent.Class

11+import Reflex.Dom.PostBuild.Class

712

813import Control.Concurrent

914import Control.Monad

@@ -11,8 +16,8 @@ import Control.Monad.Fix

1116import Control.Monad.IO.Class

1217import Data.Fixed

1318import Data.Time.Clock

14−import System.Random

1519import Data.Typeable

20+import System.Random

1621

1722data TickInfo

1823 = TickInfo { _tickInfo_lastUTC :: UTCTime

src/Reflex/Dom/Widget/Input.hs+32−20

@@ -1,50 +1,62 @@

1−{-# LANGUAGE OverloadedStrings, ConstraintKinds, TypeFamilies, FlexibleContexts, DataKinds, GADTs, ScopedTypeVariables, FlexibleInstances, RecursiveDo, TemplateHaskell, UndecidableInstances, PolyKinds #-}

1+{-# LANGUAGE ConstraintKinds #-}

2+{-# LANGUAGE DataKinds #-}

3+{-# LANGUAGE FlexibleContexts #-}

4+{-# LANGUAGE FlexibleInstances #-}

5+{-# LANGUAGE GADTs #-}

6+{-# LANGUAGE MultiParamTypeClasses #-}

7+{-# LANGUAGE OverloadedStrings #-}

8+{-# LANGUAGE PolyKinds #-}

9+{-# LANGUAGE RecursiveDo #-}

10+{-# LANGUAGE ScopedTypeVariables #-}

11+{-# LANGUAGE TemplateHaskell #-}

12+{-# LANGUAGE TypeFamilies #-}

13+{-# LANGUAGE UndecidableInstances #-}

214module Reflex.Dom.Widget.Input (module Reflex.Dom.Widget.Input, def, (&), (.~)) where

315

416import Prelude

517

6−import Reflex.Dom.Class

7−import Reflex.Dom.Widget.Basic

8−import Reflex.Dom.PostBuild.Class

918import Reflex.Dom.Builder.Class

1019import Reflex.Dom.Builder.Immediate

20+import Reflex.Dom.Class

21+import Reflex.Dom.PostBuild.Class

22+import Reflex.Dom.Widget.Basic

1123

1224-- For dropdown

13−import Reflex.Dom.PerformEvent.Class

25+import Control.Monad.Fix

26+import Control.Monad.IO.Class

27+import Data.Maybe

28+import Data.Semigroup

1429import GHCJS.DOM.HTMLInputElement (HTMLInputElement, castToHTMLInputElement)

15−import GHCJS.DOM.HTMLTextAreaElement (HTMLTextAreaElement, castToHTMLTextAreaElement)

1630import GHCJS.DOM.HTMLSelectElement (castToHTMLSelectElement)

1731import qualified GHCJS.DOM.HTMLSelectElement as HTMLSelectElement

18−import Data.Maybe

32+import GHCJS.DOM.HTMLTextAreaElement (HTMLTextAreaElement, castToHTMLTextAreaElement)

33+import Reflex.Dom.PerformEvent.Class

1934import qualified Text.Read as T

20−import Data.Semigroup

21−import Control.Monad.Fix

22−import Control.Monad.IO.Class

2335

2436-- For fileInput

37+import qualified GHCJS.DOM.Element as Element

2538import GHCJS.DOM.EventM (on)

2639import GHCJS.DOM.Types (File)

27−import qualified GHCJS.DOM.Element as Element

2840-- import qualified GHCJS.DOM.File as File

2941import qualified GHCJS.DOM.FileList as FileList

3042

3143

32−import Reflex

33−import qualified Data.Map as Map

34−import Control.Lens hiding (ix, element)

44+import Control.Lens hiding (element, ix)

3545import Control.Monad hiding (forM_)

46+import qualified Data.Bimap as Bimap

3647import Data.Default

37−import Data.Map (Map)

38−import Data.Text (Text)

39−import qualified Data.Text as T

4048import Data.Dependent.Map (DMap)

4149import qualified Data.Dependent.Map as DMap

42−import qualified Data.Bimap as Bimap

43−import Data.Proxy

4450import Data.Functor.Misc

51+import Data.Map (Map)

52+import qualified Data.Map as Map

53+import Data.Proxy

54+import Data.Text (Text)

55+import qualified Data.Text as T

56+import Reflex

4557

46−import qualified GHCJS.DOM.HTMLInputElement as Input

4758import qualified GHCJS.DOM.Event as Event

59+import qualified GHCJS.DOM.HTMLInputElement as Input

4860

4961data TextInput t

5062 = TextInput { _textInput_value :: Dynamic t Text

src/Reflex/Dom/Widget/Lazy.hs+11−6

@@ -1,23 +1,28 @@

1−{-# LANGUAGE RecursiveDo, ScopedTypeVariables, OverloadedStrings, TypeFamilies, FlexibleContexts #-}

1+{-# LANGUAGE FlexibleContexts #-}

2+{-# LANGUAGE MultiParamTypeClasses #-}

3+{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE RecursiveDo #-}

5+{-# LANGUAGE ScopedTypeVariables #-}

6+{-# LANGUAGE TypeFamilies #-}

27module Reflex.Dom.Widget.Lazy where

49import Reflex

5−import Reflex.Dom.Class

610import Reflex.Dom.Builder.Class

711import Reflex.Dom.Builder.Immediate

8−import Reflex.Dom.PostBuild.Class

12+import Reflex.Dom.Class

913import Reflex.Dom.PerformEvent.Class

14+import Reflex.Dom.PostBuild.Class

1015import Reflex.Dom.Widget.Basic

1116

1217import Control.Monad.Fix

1318import Control.Monad.IO.Class

1419import Data.Fixed

15−import Data.Monoid

16−import qualified Data.Map as Map

1720import Data.Map (Map)

18−import GHCJS.DOM.Element

21+import qualified Data.Map as Map

22+import Data.Monoid

1923import Data.Text (Text)

2024import qualified Data.Text as T

25+import GHCJS.DOM.Element

2126

2227-- |A list view for long lists. Creates a scrollable element and only renders child row elements near the current scroll position.

2328virtualListWithSelection :: forall t m k v. (DomBuilder t m, PostBuild t m, MonadHold t m, PerformEvent t m, MonadIO (Performable m), DomBuilderSpace m ~ GhcjsDomSpace, MonadFix m, Ord k)

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

@@ -1,25 +1,29 @@

1−{-# LANGUAGE RecursiveDo, TypeFamilies, FlexibleContexts, OverloadedStrings #-}

1+{-# LANGUAGE FlexibleContexts #-}

2+{-# LANGUAGE MultiParamTypeClasses #-}

3+{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE RecursiveDo #-}

5+{-# LANGUAGE TypeFamilies #-}

26module Reflex.Dom.Widget.Resize where

48import Reflex

5−import Reflex.Dom.PostBuild.Class

6−import Reflex.Dom.PerformEvent.Class

79import Reflex.Dom.Builder.Class

810import Reflex.Dom.Builder.Immediate

911import Reflex.Dom.Class

1012import Reflex.Dom.Old

13+import Reflex.Dom.PerformEvent.Class

14+import Reflex.Dom.PostBuild.Class

1115import Reflex.Dom.Widget.Basic

1216

1317import Control.Monad

1418import Control.Monad.Fix

1519import Control.Monad.IO.Class

1620import Data.Map (Map)

21+import qualified Data.Map as Map

22+import Data.Monoid

1723import Data.Text (Text)

1824import qualified Data.Text as T

19−import Data.Monoid

2025import GHCJS.DOM.Element hiding (reset)

2126import GHCJS.DOM.EventM (on)

22−import qualified Data.Map as Map

2327

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

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

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

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

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

1+{-# LANGUAGE DeriveDataTypeable #-}

2+{-# LANGUAGE DeriveFunctor #-}

3+{-# LANGUAGE FlexibleContexts #-}

4+{-# LANGUAGE GADTs #-}

5+{-# LANGUAGE MultiParamTypeClasses #-}

6+{-# LANGUAGE OverloadedStrings #-}

7+{-# LANGUAGE TemplateHaskell #-}

28module Reflex.Dom.Xhr

39 ( XMLHttpRequest

410 , XhrRequest (..)

@@ -50,9 +56,9 @@ where

5056

5157import Reflex

5258import Reflex.Dom.Class

53−import Reflex.Dom.Xhr.Foreign

5459import Reflex.Dom.PerformEvent.Class

5560import Reflex.Dom.Xhr.Exception

61+import Reflex.Dom.Xhr.Foreign

5662import Reflex.Dom.Xhr.ResponseType

5763

5864import Control.Concurrent

@@ -62,8 +68,6 @@ import Control.Monad hiding (forM)

6268import Control.Monad.IO.Class

6369import Data.Aeson

6470import Data.Aeson.Encode

65−import qualified Data.Text.Lazy as LT

66−import qualified Data.Text.Lazy.Builder as B

6771import qualified Data.ByteString.Lazy as BL

6872import Data.Default

6973import Data.Map (Map)

@@ -71,6 +75,8 @@ import qualified Data.Map as Map

7175import Data.Maybe

7276import Data.Text (Text)

7377import Data.Text.Encoding

78+import qualified Data.Text.Lazy as LT

79+import qualified Data.Text.Lazy.Builder as B

7480import Data.Traversable

7581import Data.Typeable

7682