git.iko.soy/jsaddle
on master help sign in
Rename WebKit2GTK to WebKitGTK
commit4a88ba04791082284920757aa464165e695d9e48 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateSun 18 Dec 2016, 02:39 (10 years ago) parent02f215a
6 files changed+56−22
compare with master
unifiedsplit
jsaddle-warp/jsaddle-warp.cabal+1 jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+6−2 jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKit2GTK.hs → jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+22−9 jsaddle-webkitgtk/jsaddle-webkitgtk.cabal+2−1 jsaddle-webkitgtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+24−10 jsaddle/jsaddle.cabal+1
jsaddle-warp/jsaddle-warp.cabal+1
@@ -17,6 +17,7 @@ author: Hamish Mackenzie
1717source-repository head
1818 type: git
1919 location: https://github.com/ghcjs/jsaddle
20+ subdir: jsaddle-warp
2021
2122library
2223
jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+6−2
@@ -1,5 +1,5 @@
11name: jsaddle-webkit2gtk
2−version: 0.8.0.0
2+version: 0.8.1.0
33cabal-version: >=1.10
44build-type: Simple
55license: MIT
@@ -17,11 +17,15 @@ author: Hamish Mackenzie
1717source-repository head
1818 type: git
1919 location: https://github.com/ghcjs/jsaddle
20+ subdir: jsaddle-webkit2gtk
2021
2122library
2223 exposed-modules:
23− Language.Javascript.JSaddle.WebKit2GTK
24+ Language.Javascript.JSaddle.WebKitGTK
2425 build-depends:
26+ base <5
27+ if !impl(ghcjs -any)
28+ build-depends:
2529 aeson >=0.8.0.2 && <1.1,
2630 base <5,
2731 bytestring >=0.10.6.0 && <0.11,
jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKit2GTK.hs → jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hsrenamed+22−9
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE ScopedTypeVariables #-}
23{-# LANGUAGE OverloadedStrings #-}
34{-# LANGUAGE PatternSynonyms #-}
@@ -13,12 +14,22 @@
1314-- |
1415--
1516-----------------------------------------------------------------------------
16−module Language.Javascript.JSaddle.WebKit2GTK (
17+module Language.Javascript.JSaddle.WebKitGTK (
1718 -- * Running JSM in a WebView
1819 run
20+#ifndef ghcjs_HOST_OS
1921 , runInWebView
22+#endif
2023 ) where
2124
25+#ifdef ghcjs_HOST_OS
26+
27+run = IO () -> IO ()
28+run = id
29+{-# INLINE run #-}
30+
31+#else
32+
2233import Control.Monad (void)
2334import Control.Monad.IO.Class (MonadIO(..), MonadIO)
2435import Control.Concurrent (forkIO, yield)
@@ -166,11 +177,13 @@ addJSaddleHandler webView processResult = do
166177 void $ userContentManagerRegisterScriptMessageHandler manager "jsaddle"
167178
168179jsaddleJs :: LB.ByteString
169−jsaddleJs = ghcjsHelpers <> "\
170− \runJSaddleBatch = (function() {\n\
171− \ " <> initState <> "\n\
172− \ return function(batch) {\n\
173− \ " <> runBatch (\a -> "window.webkit.messageHandlers.jsaddle.postMessage(JSON.stringify(" <> a <> "));") <> "\
174− \ };\n\
175− \})()\n\
176− \"
180+jsaddleJs = ghcjsHelpers <> mconcat
181+ [ "runJSaddleBatch = (function() {\n"
182+ , initState
183+ , "\nreturn function(batch) {\n"
184+ , runBatch (\a -> "window.webkit.messageHandlers.jsaddle.postMessage(JSON.stringify(" <> a <> "));\n")
185+ , "};\n"
186+ , "})()"
187+ ]
188+
189+#endif
jsaddle-webkitgtk/jsaddle-webkitgtk.cabal+2−1
@@ -1,5 +1,5 @@
11name: jsaddle-webkitgtk
2−version: 0.8.0.0
2+version: 0.8.1.0
33cabal-version: >=1.10
44build-type: Simple
55license: MIT
@@ -17,6 +17,7 @@ author: Hamish Mackenzie
1717source-repository head
1818 type: git
1919 location: https://github.com/ghcjs/jsaddle
20+ subdir: jsaddle-webkitgtk
2021
2122library
2223 exposed-modules:
jsaddle-webkitgtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+24−10
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE ScopedTypeVariables #-}
23{-# LANGUAGE OverloadedStrings #-}
34{-# LANGUAGE PatternSynonyms #-}
@@ -16,15 +17,26 @@
1617module Language.Javascript.JSaddle.WebKitGTK (
1718 -- * Running JSM in a WebView
1819 run
20+#ifndef ghcjs_HOST_OS
1921 , runInWebView
22+#endif
2023 ) where
2124
25+#ifdef ghcjs_HOST_OS
26+
27+run = IO () -> IO ()
28+run = id
29+{-# INLINE run #-}
30+
31+#else
32+
2233import Control.Monad (when, void)
2334import qualified Control.Exception as E (catch)
2435import Control.Exception (SomeException(..))
2536import Control.Concurrent (forkIO, yield)
2637
27−import System.Posix.Signals (installHandler)
38+import System.Posix.Signals
39+ (Handler(..), keyboardSignal, installHandler)
2840import System.Directory (getCurrentDirectory)
2941
3042import Data.Monoid ((<>))
@@ -200,12 +212,14 @@ addJSaddleHandler ctxRef processResult = do
200212 jsvaluemakeundefined ctxRef
201213
202214jsaddleJs :: LB.ByteString
203−jsaddleJs = ghcjsHelpers <> "\
204− \(function() {\n\
205− \ " <> initState <> "\n\
206− \ return function(batchJSON) {\n\
207− \ var batch = JSON.parse(batchJSON);\n\
208− \ " <> runBatch (\a -> "window.jsaddleCallback(JSON.stringify(" <> a <> "));") <> "\
209− \ };\n\
210− \})()\n\
211− \"
215+jsaddleJs = ghcjsHelpers <> mconcat
216+ [ "(function() {\n"
217+ , initState
218+ , "\nreturn function(batchJSON) {\n"
219+ , " var batch = JSON.parse(batchJSON);\n"
220+ , runBatch (\a -> "window.jsaddleCallback(JSON.stringify(" <> a <> "));\n")
221+ , "};\n"
222+ , "})()\n"
223+ ]
224+
225+#endif
jsaddle/jsaddle.cabal+1
@@ -17,6 +17,7 @@ author: Hamish Mackenzie
1717source-repository head
1818 type: git
1919 location: https://github.com/ghcjs/jsaddle
20+ subdir: jsaddle
2021
2122library
2223