on master help sign in
Fix #11
6d1d45dHamish Mackenzie
jsaddle.cabal+3−2
@@ -1,5 +1,5 @@
1name: jsaddle
1name: jsaddle
2−version: 0.4.0.3
2+version: 0.4.0.4
3cabal-version: >=1.10
3cabal-version: >=1.10
4build-type: Simple
4build-type: Simple
5license: MIT
5license: MIT
@@ -31,6 +31,8 @@ library
31 gi-webkit >=3.0.2 && <3.1,
31 gi-webkit >=3.0.2 && <3.1,
32 gi-javascriptcore >=3.0.2 && <3.1,
32 gi-javascriptcore >=3.0.2 && <3.1,
33 webkitgtk3-javascriptcore >=0.14.0.0 && <0.15
33 webkitgtk3-javascriptcore >=0.14.0.0 && <0.15
34+ exposed-modules:
35+ Language.Javascript.JSaddle.Test
34 exposed-modules:
36 exposed-modules:
35 Language.Javascript.JSaddle
37 Language.Javascript.JSaddle
36 Language.Javascript.JSaddle.Arguments
38 Language.Javascript.JSaddle.Arguments
@@ -44,7 +46,6 @@ library
44 Language.Javascript.JSaddle.String
46 Language.Javascript.JSaddle.String
45 Language.Javascript.JSaddle.Value
47 Language.Javascript.JSaddle.Value
46 Language.Javascript.JSaddle.Types
48 Language.Javascript.JSaddle.Types
47− Language.Javascript.JSaddle.Test
48 build-depends:
49 build-depends:
49 template-haskell -any,
50 template-haskell -any,
50 base <5,
51 base <5,
src/Language/Javascript/JSaddle/Monad.hs+5−3
@@ -48,13 +48,14 @@ import GI.WebKit.Objects.WebFrame
48 (webFrameGetGlobalContext)
48 (webFrameGetGlobalContext)
49import GI.GLib (idleAdd)
49import GI.GLib (idleAdd)
50import GI.GLib.Constants(pattern PRIORITY_DEFAULT)
50import GI.GLib.Constants(pattern PRIORITY_DEFAULT)
51−#endif
52−import qualified Control.Exception as E (Exception, catch, bracket)
53−import Control.Concurrent.MVar (takeMVar, putMVar, newEmptyMVar)
54import Foreign.Ptr (castPtr)
51import Foreign.Ptr (castPtr)
55import GI.JavaScriptCore.Structs.GlobalContext (GlobalContext(..))
52import GI.JavaScriptCore.Structs.GlobalContext (GlobalContext(..))
56import Foreign.ForeignPtr (withForeignPtr)
53import Foreign.ForeignPtr (withForeignPtr)
54+#endif
55+import qualified Control.Exception as E (Exception, catch, bracket)
56+import Control.Concurrent.MVar (takeMVar, putMVar, newEmptyMVar)
57
57
58+#ifndef ghcjs_HOST_OS
58-- | Post an action to be run in the main GUI thread.
59-- | Post an action to be run in the main GUI thread.
59--
60--
60-- The current thread blocks until the action completes and the result is
61-- The current thread blocks until the action completes and the result is
@@ -75,6 +76,7 @@ postGUIAsync :: IO () -> IO ()
75postGUIAsync action = do
76postGUIAsync action = do
76 idleAdd PRIORITY_DEFAULT $ action >> return False
77 idleAdd PRIORITY_DEFAULT $ action >> return False
77 return ()
78 return ()
79+#endif
78
80
79-- | Wrapped version of 'E.catch' that runs in a MonadIO that works
81-- | Wrapped version of 'E.catch' that runs in a MonadIO that works
80-- a bit better with 'JSM'
82-- a bit better with 'JSM'