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

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

compare with develop

unifiedsplit

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

4 , js_dataView

5 ) where

6

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

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

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

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

9

10synchronously :: JSM a -> JSM a

11synchronously = id

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

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

8 ) where

9

10import GHCJS.Concurrent

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

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

12import GHCJS.Foreign.Callback (releaseCallback)

13

14freeRequestAnimationFrameCallback :: RequestAnimationFrameCallback -> JSM ()

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

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

6#ifndef ghcjs_HOST_OS

7

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

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

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

10import Reflex.DynamicWriter (DynamicWriterT)

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

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

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

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

13import Reflex.PostBuild.Base (PostBuildT)

14import Reflex.Requester.Base (RequesterT)

15import Reflex.TriggerEvent.Base

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

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

1{-# LANGUAGE CPP #-}

2+{-# LANGUAGE ConstraintKinds #-}

2{-# LANGUAGE EmptyDataDecls #-}

3{-# LANGUAGE EmptyDataDecls #-}

3{-# LANGUAGE ExistentialQuantification #-}

4{-# LANGUAGE ExistentialQuantification #-}

4{-# LANGUAGE FlexibleContexts #-}

5{-# LANGUAGE FlexibleContexts #-}

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

8{-# LANGUAGE MultiParamTypeClasses #-}

9{-# LANGUAGE MultiParamTypeClasses #-}

9{-# LANGUAGE RankNTypes #-}

10{-# LANGUAGE RankNTypes #-}

10{-# LANGUAGE StandaloneDeriving #-}

11{-# LANGUAGE StandaloneDeriving #-}

11−#ifdef USE_TEMPLATE_HASKELL

12−{-# LANGUAGE TemplateHaskell #-}

13−#endif

14{-# LANGUAGE TypeFamilies #-}

12{-# LANGUAGE TypeFamilies #-}

15{-# LANGUAGE TypeSynonymInstances #-}

13{-# LANGUAGE TypeSynonymInstances #-}

16{-# LANGUAGE UndecidableInstances #-}

14{-# LANGUAGE UndecidableInstances #-}

17−{-# LANGUAGE ConstraintKinds #-}

15+#ifdef USE_TEMPLATE_HASKELL

16+{-# LANGUAGE TemplateHaskell #-}

17+#endif

18#ifdef ghcjs_HOST_OS

19{-# LANGUAGE ForeignFunctionInterface #-}

20{-# LANGUAGE JavaScriptFFI #-}

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

25#endif

26 ) where

27

28+import Foreign.JavaScript.Orphans ()

28−import Prelude hiding((!!))

29+import Prelude hiding ((!!))

29import Reflex.Class

30import Reflex.Class

30import Reflex.DynamicWriter

31import Reflex.DynamicWriter

31import Reflex.EventWriter

32import Reflex.EventWriter

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

34import Reflex.PerformEvent.Class

35import Reflex.PerformEvent.Class

35import Reflex.PostBuild.Base

36import Reflex.PostBuild.Base

36import Reflex.Requester.Base

37import Reflex.Requester.Base

37−import Foreign.JavaScript.Orphans ()

38

39#ifdef USE_TEMPLATE_HASKELL

40import Language.Haskell.TH

41#endif

42

43−import GHCJS.DOM.Types

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

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

45#ifdef ghcjs_HOST_OS

44#ifdef ghcjs_HOST_OS

46−import GHCJS.DOM.Types (MonadJSM)

47import qualified GHCJS.Buffer as JS

45import qualified GHCJS.Buffer as JS

46+import GHCJS.DOM.Types (MonadJSM)

48import qualified GHCJS.DOM.Types as JS

47import qualified GHCJS.DOM.Types as JS

49import qualified GHCJS.Foreign as JS

48import qualified GHCJS.Foreign as JS

50import qualified GHCJS.Foreign.Callback as JS

49import qualified GHCJS.Foreign.Callback as JS

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

61import Foreign.Ptr

60import Foreign.Ptr

62import Text.Encoding.Z

61import Text.Encoding.Z

63#else

62#else

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

65−import Data.Word (Word8)

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

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

64+import Data.Word (Word8)

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

67−import Language.Javascript.JSaddle

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

68− (eval, valMakeString, valToNumber, function,

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

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

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

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

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

72#endif

69#endif

73

70

74import Control.Concurrent

71import Control.Concurrent

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

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

3 , bsToArrayBuffer

4 ) where

5

6−import Data.ByteString (ByteString)

6+import Data.ByteString (ByteString)

7import qualified Data.ByteString as BS

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

8import qualified GHCJS.Buffer as JS

9import qualified GHCJS.Buffer as JS

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

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

10import qualified JavaScript.TypedArray.ArrayBuffer as JS

11import qualified JavaScript.TypedArray.ArrayBuffer as JS

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

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

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

13

14{-# INLINABLE bsFromMutableArrayBuffer #-}

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

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

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

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

2

3import Control.Lens

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

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

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

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

6

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

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

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

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

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

2

3import Data.Text (Text)

4−import GHCJS.DOM.Types (MonadJSM)

5import GHCJS.DOM (currentWindowUnchecked)

4import GHCJS.DOM (currentWindowUnchecked)

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

6+import GHCJS.DOM.Types (MonadJSM)

6import GHCJS.DOM.Window (getLocation)

7import GHCJS.DOM.Window (getLocation)

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

8

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

10getLocationHost = currentWindowUnchecked >>= getLocation >>= getHost

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

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

4{-# LANGUAGE GADTs #-}

5{-# LANGUAGE MultiParamTypeClasses #-}

6{-# LANGUAGE NoMonomorphismRestriction #-}

7+{-# LANGUAGE PatternSynonyms #-}

7{-# LANGUAGE RankNTypes #-}

8{-# LANGUAGE RankNTypes #-}

8{-# LANGUAGE RecursiveDo #-}

9{-# LANGUAGE RecursiveDo #-}

9{-# LANGUAGE ScopedTypeVariables #-}

10{-# LANGUAGE ScopedTypeVariables #-}

10{-# LANGUAGE TypeFamilies #-}

11{-# LANGUAGE TypeFamilies #-}

11{-# LANGUAGE TypeOperators #-}

12{-# LANGUAGE TypeOperators #-}

12{-# LANGUAGE UndecidableInstances #-}

13{-# LANGUAGE UndecidableInstances #-}

13−{-# LANGUAGE PatternSynonyms #-}

14module Reflex.Dom.Main where

15

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

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

39import GHCJS.DOM

40import GHCJS.DOM.Document

41import GHCJS.DOM.Element

42−import GHCJS.DOM.NonElementParentNode

43import GHCJS.DOM.Node

42import GHCJS.DOM.Node

44−import qualified GHCJS.DOM.Types as DOM

43+import GHCJS.DOM.NonElementParentNode

45import GHCJS.DOM.Types (JSM)

44import GHCJS.DOM.Types (JSM)

45+import qualified GHCJS.DOM.Types as DOM

46

47{-# INLINABLE mainWidget #-}

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

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

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

1−{-# LANGUAGE ScopedTypeVariables #-}

2{-# LANGUAGE FlexibleContexts #-}

1{-# LANGUAGE FlexibleContexts #-}

3{-# LANGUAGE MultiParamTypeClasses #-}

2{-# LANGUAGE MultiParamTypeClasses #-}

4{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE OverloadedStrings #-}

5{-# LANGUAGE RecursiveDo #-}

4{-# LANGUAGE RecursiveDo #-}

5+{-# LANGUAGE ScopedTypeVariables #-}

6{-# LANGUAGE TypeFamilies #-}

7module Reflex.Dom.Widget.Resize where

8

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

25import Data.Text (Text)

26import qualified Data.Text as T

27import GHCJS.DOM.Element

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

29import GHCJS.DOM.EventM (on)

28import GHCJS.DOM.EventM (on)

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

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

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

31import qualified GHCJS.DOM.Types as DOM

32

33-- | 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 @@

1module Reflex.Dom (module X) where

2

3−import Reflex.Dom.Core as X hiding

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

4− (mainWidget, mainWidgetWithHead, mainWidgetWithCss,

5− mainWidgetWithHead', mainWidgetInElementById, runApp')

4+ mainWidgetWithHead, mainWidgetWithHead', runApp')

6import Reflex.Dom.Internal as X

5import Reflex.Dom.Internal as X

7

6