on master help sign in
Fix #11
commit6d1d45dd0ab3664a6f0e2c93fa4bb55484effa34 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateTue 5 Jul 2016, 15:39 (10 years ago) parent8de95d9
2 files changed+8−5
jsaddle.cabal+3−2 src/Language/Javascript/JSaddle/Monad.hs+5−3
jsaddle.cabal+3−2
@@ -1,5 +1,5 @@
11name: jsaddle
2−version: 0.4.0.3
2+version: 0.4.0.4
33cabal-version: >=1.10
44build-type: Simple
55license: MIT
@@ -31,6 +31,8 @@ library
3131 gi-webkit >=3.0.2 && <3.1,
3232 gi-javascriptcore >=3.0.2 && <3.1,
3333 webkitgtk3-javascriptcore >=0.14.0.0 && <0.15
34+ exposed-modules:
35+ Language.Javascript.JSaddle.Test
3436 exposed-modules:
3537 Language.Javascript.JSaddle
3638 Language.Javascript.JSaddle.Arguments
@@ -44,7 +46,6 @@ library
4446 Language.Javascript.JSaddle.String
4547 Language.Javascript.JSaddle.Value
4648 Language.Javascript.JSaddle.Types
47− Language.Javascript.JSaddle.Test
4849 build-depends:
4950 template-haskell -any,
5051 base <5,
src/Language/Javascript/JSaddle/Monad.hs+5−3
@@ -48,13 +48,14 @@ import GI.WebKit.Objects.WebFrame
4848 (webFrameGetGlobalContext)
4949import GI.GLib (idleAdd)
5050import 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)
5451import Foreign.Ptr (castPtr)
5552import GI.JavaScriptCore.Structs.GlobalContext (GlobalContext(..))
5653import Foreign.ForeignPtr (withForeignPtr)
54+#endif
55+import qualified Control.Exception as E (Exception, catch, bracket)
56+import Control.Concurrent.MVar (takeMVar, putMVar, newEmptyMVar)
5757
58+#ifndef ghcjs_HOST_OS
5859-- | Post an action to be run in the main GUI thread.
5960--
6061-- The current thread blocks until the action completes and the result is
@@ -75,6 +76,7 @@ postGUIAsync :: IO () -> IO ()
7576postGUIAsync action = do
7677 idleAdd PRIORITY_DEFAULT $ action >> return False
7778 return ()
79+#endif
7880
7981-- | Wrapped version of 'E.catch' that runs in a MonadIO that works
8082-- a bit better with 'JSM'