729c605 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

stylish-haskell

commit729c605f1869b1937dbc355c3a42b5491bc69825 authorRyan Trinkle <ryan.trinkle@gmail.com> dateFri 5 May 2017, 22:11 (9 years ago) parente5983b8

10 files changed+34−38

compare with develop

unifiedsplit

reflex-dom-core/src-ghc/Foreign/JavaScript/Internal/Utils.hs+2−2 reflex-dom-core/src-ghcjs/Foreign/JavaScript/Internal/Utils.hs+1−1 reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+3−3 reflex-dom-core/src/Foreign/JavaScript/TH.hs+13−16 reflex-dom-core/src/Foreign/JavaScript/Utils.hs+4−4 reflex-dom-core/src/Reflex/Dom/Builder/Class/TH.hs+1−1 reflex-dom-core/src/Reflex/Dom/Location.hs+2−2 reflex-dom-core/src/Reflex/Dom/Main.hs+3−3 reflex-dom-core/src/Reflex/Dom/Widget/Resize.hs+3−3 reflex-dom/src/Reflex/Dom.hs+2−3

reflex-dom-core/src-ghc/Foreign/JavaScript/Internal/Utils.hs+2−2

@@ -4,8 +4,8 @@ module Foreign.JavaScript.Internal.Utils

44 , js_dataView

55 ) where

7−import GHCJS.DOM.Types (JSM, JSVal, RequestAnimationFrameCallback (..), Callback (..))

8−import Language.Javascript.JSaddle.Object (freeFunction, new, jsg)

7+import GHCJS.DOM.Types (Callback (..), JSM, JSVal, RequestAnimationFrameCallback (..))

8+import Language.Javascript.JSaddle.Object (freeFunction, jsg, new)

1010synchronously :: JSM a -> JSM a

1111synchronously = id

reflex-dom-core/src-ghcjs/Foreign/JavaScript/Internal/Utils.hs+1−1

@@ -8,7 +8,7 @@ module Foreign.JavaScript.Internal.Utils

88 ) where

1010import GHCJS.Concurrent

11−import GHCJS.DOM.Types (JSVal, JSM, RequestAnimationFrameCallback (..))

11+import GHCJS.DOM.Types (JSM, JSVal, RequestAnimationFrameCallback (..))

1212import GHCJS.Foreign.Callback (releaseCallback)

1313

1414freeRequestAnimationFrameCallback :: RequestAnimationFrameCallback -> JSM ()

reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+3−3

@@ -6,10 +6,10 @@ module Foreign.JavaScript.Orphans where

66#ifndef ghcjs_HOST_OS

88import Control.Monad.Trans.Class (lift)

9−import GHCJS.DOM.Types (MonadJSM(..))

9+import GHCJS.DOM.Types (MonadJSM (..))

1010import Reflex.DynamicWriter (DynamicWriterT)

11−import Reflex.Host.Class (ReflexHost, HostFrame)

12−import Reflex.PerformEvent.Base (PerformEventT(..))

11+import Reflex.Host.Class (HostFrame, ReflexHost)

12+import Reflex.PerformEvent.Base (PerformEventT (..))

1313import Reflex.PostBuild.Base (PostBuildT)

1414import Reflex.Requester.Base (RequesterT)

1515import Reflex.TriggerEvent.Base

reflex-dom-core/src/Foreign/JavaScript/TH.hs+13−16

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

11{-# LANGUAGE CPP #-}

2+{-# LANGUAGE ConstraintKinds #-}

23{-# LANGUAGE EmptyDataDecls #-}

34{-# LANGUAGE ExistentialQuantification #-}

45{-# LANGUAGE FlexibleContexts #-}

@@ -8,13 +9,12 @@

89{-# LANGUAGE MultiParamTypeClasses #-}

910{-# LANGUAGE RankNTypes #-}

1011{-# LANGUAGE StandaloneDeriving #-}

11−#ifdef USE_TEMPLATE_HASKELL

12−{-# LANGUAGE TemplateHaskell #-}

13−#endif

1412{-# LANGUAGE TypeFamilies #-}

1513{-# LANGUAGE TypeSynonymInstances #-}

1614{-# LANGUAGE UndecidableInstances #-}

17−{-# LANGUAGE ConstraintKinds #-}

15+#ifdef USE_TEMPLATE_HASKELL

16+{-# LANGUAGE TemplateHaskell #-}

17+#endif

1818#ifdef ghcjs_HOST_OS

1919{-# LANGUAGE ForeignFunctionInterface #-}

2020{-# LANGUAGE JavaScriptFFI #-}

@@ -25,7 +25,8 @@ module Foreign.JavaScript.TH ( module Foreign.JavaScript.TH

2525#endif

2626 ) where

2727

28−import Prelude hiding((!!))

28+import Foreign.JavaScript.Orphans ()

29+import Prelude hiding ((!!))

2930import Reflex.Class

3031import Reflex.DynamicWriter

3132import Reflex.EventWriter

@@ -34,17 +35,15 @@ import Reflex.PerformEvent.Base

3435import Reflex.PerformEvent.Class

3536import Reflex.PostBuild.Base

3637import Reflex.Requester.Base

37−import Foreign.JavaScript.Orphans ()

3838

3939#ifdef USE_TEMPLATE_HASKELL

4040import Language.Haskell.TH

4141#endif

4242

43−import GHCJS.DOM.Types

44− (askJSM, JSContextRef, Node(..))

43+import GHCJS.DOM.Types (JSContextRef, Node (..), askJSM)

4544#ifdef ghcjs_HOST_OS

46−import GHCJS.DOM.Types (MonadJSM)

4745import qualified GHCJS.Buffer as JS

46+import GHCJS.DOM.Types (MonadJSM)

4847import qualified GHCJS.DOM.Types as JS

4948import qualified GHCJS.Foreign as JS

5049import qualified GHCJS.Foreign.Callback as JS

@@ -61,14 +60,12 @@ import Foreign.C.Types

6160import Foreign.Ptr

6261import Text.Encoding.Z

6362#else

64−import GHCJS.DOM.Types (MonadJSM(..), runJSM, liftJSM, toJSString, toJSVal, JSVal)

65−import Data.Word (Word8)

6663import Control.Lens.Operators ((^.))

67−import Language.Javascript.JSaddle

68− (eval, valMakeString, valToNumber, function,

69− valMakeNumber, valBool, valToText, valToBool, valIsUndefined,

70− valUndefined, valIsNull, Function(..), (!!),

71− js, js1, jss, array, freeFunction)

64+import Data.Word (Word8)

65+import GHCJS.DOM.Types (JSVal, MonadJSM (..), liftJSM, runJSM, toJSString, toJSVal)

66+import Language.Javascript.JSaddle (Function (..), array, eval, freeFunction, function, js, js1, jss, valBool,

67+ valIsNull, valIsUndefined, valMakeNumber, valMakeString, valToBool,

68+ valToNumber, valToText, valUndefined, (!!))

7269#endif

7370

7471import Control.Concurrent

reflex-dom-core/src/Foreign/JavaScript/Utils.hs+4−4

@@ -3,13 +3,13 @@ module Foreign.JavaScript.Utils

33 , bsToArrayBuffer

44 ) where

6−import Data.ByteString (ByteString)

6+import Data.ByteString (ByteString)

77import qualified Data.ByteString as BS

8+import Foreign.JavaScript.Internal.Utils (js_dataView)

89import qualified GHCJS.Buffer as JS

9−import GHCJS.DOM.Types (ArrayBuffer (..))

10+import GHCJS.DOM.Types (ArrayBuffer (..))

1011import qualified JavaScript.TypedArray.ArrayBuffer as JS

11−import Language.Javascript.JSaddle.Types (MonadJSM, liftJSM, ghcjsPure, jsval)

12−import Foreign.JavaScript.Internal.Utils (js_dataView)

12+import Language.Javascript.JSaddle.Types (MonadJSM, ghcjsPure, jsval, liftJSM)

1313

1414{-# INLINABLE bsFromMutableArrayBuffer #-}

1515bsFromMutableArrayBuffer :: MonadJSM m => JS.MutableArrayBuffer -> m ByteString

reflex-dom-core/src/Reflex/Dom/Builder/Class/TH.hs+1−1

@@ -1,8 +1,8 @@

11module Reflex.Dom.Builder.Class.TH where

33import Control.Lens

4−import Language.Haskell.TH.Syntax (Name, nameBase)

54import Language.Haskell.TH.Lib (DecsQ)

5+import Language.Haskell.TH.Syntax (Name, nameBase)

77namer :: [String] -> Name -> [Name] -> Name -> [DefName]

88namer s n ks t | nameBase t `elem` s = []

reflex-dom-core/src/Reflex/Dom/Location.hs+2−2

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

11module Reflex.Dom.Location (getLocationHost, getLocationProtocol) where

33import Data.Text (Text)

4−import GHCJS.DOM.Types (MonadJSM)

54import GHCJS.DOM (currentWindowUnchecked)

5+import GHCJS.DOM.Location (getHost, getProtocol)

6+import GHCJS.DOM.Types (MonadJSM)

67import GHCJS.DOM.Window (getLocation)

7−import GHCJS.DOM.Location (getProtocol, getHost)

99getLocationHost :: (MonadJSM m) => m Text

1010getLocationHost = currentWindowUnchecked >>= getLocation >>= getHost

reflex-dom-core/src/Reflex/Dom/Main.hs+3−3

@@ -4,13 +4,13 @@

44{-# LANGUAGE GADTs #-}

55{-# LANGUAGE MultiParamTypeClasses #-}

66{-# LANGUAGE NoMonomorphismRestriction #-}

7+{-# LANGUAGE PatternSynonyms #-}

78{-# LANGUAGE RankNTypes #-}

89{-# LANGUAGE RecursiveDo #-}

910{-# LANGUAGE ScopedTypeVariables #-}

1011{-# LANGUAGE TypeFamilies #-}

1112{-# LANGUAGE TypeOperators #-}

1213{-# LANGUAGE UndecidableInstances #-}

13−{-# LANGUAGE PatternSynonyms #-}

1414module Reflex.Dom.Main where

1515

1616import Prelude hiding (concat, mapM, mapM_, sequence, sequence_)

@@ -39,10 +39,10 @@ import Data.Text.Encoding

3939import GHCJS.DOM

4040import GHCJS.DOM.Document

4141import GHCJS.DOM.Element

42−import GHCJS.DOM.NonElementParentNode

4342import GHCJS.DOM.Node

44−import qualified GHCJS.DOM.Types as DOM

43+import GHCJS.DOM.NonElementParentNode

4544import GHCJS.DOM.Types (JSM)

45+import qualified GHCJS.DOM.Types as DOM

4646

4747{-# INLINABLE mainWidget #-}

4848mainWidget :: (forall x. Widget x ()) -> JSM ()

reflex-dom-core/src/Reflex/Dom/Widget/Resize.hs+3−3

@@ -1,8 +1,8 @@

1−{-# LANGUAGE ScopedTypeVariables #-}

21{-# LANGUAGE FlexibleContexts #-}

32{-# LANGUAGE MultiParamTypeClasses #-}

43{-# LANGUAGE OverloadedStrings #-}

54{-# LANGUAGE RecursiveDo #-}

5+{-# LANGUAGE ScopedTypeVariables #-}

66{-# LANGUAGE TypeFamilies #-}

77module Reflex.Dom.Widget.Resize where

@@ -25,9 +25,9 @@ import Data.Monoid

2525import Data.Text (Text)

2626import qualified Data.Text as T

2727import GHCJS.DOM.Element

28−import qualified GHCJS.DOM.GlobalEventHandlers as Events (scroll)

2928import GHCJS.DOM.EventM (on)

30−import GHCJS.DOM.Types (liftJSM, MonadJSM)

29+import qualified GHCJS.DOM.GlobalEventHandlers as Events (scroll)

30+import GHCJS.DOM.Types (MonadJSM, liftJSM)

3131import qualified GHCJS.DOM.Types as DOM

3232

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

reflex-dom/src/Reflex/Dom.hs+2−3

@@ -1,7 +1,6 @@

11module Reflex.Dom (module X) where

3−import Reflex.Dom.Core as X hiding

4− (mainWidget, mainWidgetWithHead, mainWidgetWithCss,

5− mainWidgetWithHead', mainWidgetInElementById, runApp')

3+import Reflex.Dom.Core as X hiding (mainWidget, mainWidgetInElementById, mainWidgetWithCss,

4+ mainWidgetWithHead, mainWidgetWithHead', runApp')

65import Reflex.Dom.Internal as X