git.iko.soy/jsaddle
on 243d63f help sign in
376df8e
swap
0 ahead, 9 behind
4 files changed+9−14
since splitsnapshots
unifiedsplit
jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+3−9 jsaddle/jsaddle.cabal+1−1 jsaddle/src/Language/Javascript/JSaddle/Object.hs+4−3 jsaddle/src/Language/Javascript/JSaddle/Run/Files.hs+1−1
jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+3−9
@@ -82,12 +82,6 @@ import Language.Javascript.JSaddle (JSM, Results, Batch)
8282import Language.Javascript.JSaddle.Run (runJavaScript)
8383import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)
8484
85−noAdjustment :: Maybe Adjustment
86−noAdjustment = Nothing
87−
88−noCancellable :: Maybe Cancellable
89−noCancellable = Nothing
90−
9185quitWebView :: WebView -> IO ()
9286quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?
9387 widgetDestroy w
@@ -110,7 +104,7 @@ run main = do
110104 _ <- timeoutAdd PRIORITY_HIGH 10 (yield >> return True)
111105 windowSetDefaultSize window 900 600
112106 windowSetPosition window WindowPositionCenter
113− scrollWin <- scrolledWindowNew noAdjustment noAdjustment
107+ scrollWin <- scrolledWindowNew (Nothing :: Maybe Adjustment) (Nothing :: Maybe Adjustment)
114108 contentManager <- userContentManagerNew
115109 webView <- webViewNewWithUserContentManager contentManager
116110 settings <- webViewGetSettings webView
@@ -134,11 +128,11 @@ run main = do
134128runInWebView :: JSM () -> WebView -> IO ()
135129runInWebView f webView = do
136130 (processResults, syncResults, start) <- runJavaScript (\batch -> postGUIAsync $
137− webViewRunJavascript webView (decodeUtf8 . toStrict $ "runJSaddleBatch(" <> encode batch <> ");") noCancellable Nothing)
131+ webViewRunJavascript webView (decodeUtf8 . toStrict $ "runJSaddleBatch(" <> encode batch <> ");") (Nothing :: Maybe Cancellable) Nothing)
138132 f
139133
140134 addJSaddleHandler webView processResults syncResults
141− webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) noCancellable . Just $
135+ webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) (Nothing :: Maybe Cancellable) . Just $
142136 \_obj _asyncResult ->
143137 void $ forkIO start
144138
jsaddle/jsaddle.cabal+1−1
@@ -10,7 +10,7 @@ description:
1010 This package provides an EDSL for calling JavaScript that
1111 can be used both from GHCJS and GHC. When using GHC
1212 the application is run using Warp and WebSockets to
13− drive a small JavaScript helper.
13+ drive a small JavaScipt helper.
1414category: Web, Javascript
1515author: Hamish Mackenzie
1616
jsaddle/src/Language/Javascript/JSaddle/Object.hs+4−3
@@ -526,11 +526,12 @@ array args = do
526526 Object . coerce <$> fromListIO rargs
527527
528528-- | JavaScript's global object
529+global :: Object
529530#ifdef ghcjs_HOST_OS
530−foreign import javascript unsafe "$r = globalThis"
531− global :: Object
531+global = js_window
532+foreign import javascript unsafe "$r = window"
533+ js_window :: Object
532534#else
533−global :: Object
534535global = Object . JSVal . unsafePerformIO $ newIORef 4
535536#endif
536537
jsaddle/src/Language/Javascript/JSaddle/Run/Files.hs+1−1
@@ -41,7 +41,7 @@ initState = "\
4141 \ jsaddle_values.set(1, undefined);\n\
4242 \ jsaddle_values.set(2, false);\n\
4343 \ jsaddle_values.set(3, true);\n\
44− \ jsaddle_values.set(4, globalThis);\n\
44+ \ jsaddle_values.set(4, window);\n\
4545 \ var jsaddle_index = 100;\n\
4646 \ var expectedBatch = 1;\n\
4747 \ var lastResults = [0, {\"tag\": \"Success\", \"contents\": [[], []]}];\n\