@@ -82,6 +82,12 @@ import Language.Javascript.JSaddle (JSM, Results, Batch)
82import Language.Javascript.JSaddle.Run (runJavaScript)
82import Language.Javascript.JSaddle.Run (runJavaScript)
83import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)
83import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)
85+noAdjustment :: Maybe Adjustment
86+noAdjustment = Nothing
88+noCancellable :: Maybe Cancellable
89+noCancellable = Nothing
85quitWebView :: WebView -> IO ()
91quitWebView :: WebView -> IO ()
86quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?
92quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?
87 widgetDestroy w
93 widgetDestroy w
@@ -104,7 +110,7 @@ run main = do
104 _ <- timeoutAdd PRIORITY_HIGH 10 (yield >> return True)
110 _ <- timeoutAdd PRIORITY_HIGH 10 (yield >> return True)
105 windowSetDefaultSize window 900 600
111 windowSetDefaultSize window 900 600
106 windowSetPosition window WindowPositionCenter
112 windowSetPosition window WindowPositionCenter
107− scrollWin <- scrolledWindowNew (Nothing :: Maybe Adjustment) (Nothing :: Maybe Adjustment)
113+ scrollWin <- scrolledWindowNew noAdjustment noAdjustment
108 contentManager <- userContentManagerNew
114 contentManager <- userContentManagerNew
109 webView <- webViewNewWithUserContentManager contentManager
115 webView <- webViewNewWithUserContentManager contentManager
110 settings <- webViewGetSettings webView
116 settings <- webViewGetSettings webView
@@ -128,11 +134,11 @@ run main = do
128runInWebView :: JSM () -> WebView -> IO ()
134runInWebView :: JSM () -> WebView -> IO ()
129runInWebView f webView = do
135runInWebView f webView = do
130 (processResults, syncResults, start) <- runJavaScript (\batch -> postGUIAsync $
136 (processResults, syncResults, start) <- runJavaScript (\batch -> postGUIAsync $
131− webViewRunJavascript webView (decodeUtf8 . toStrict $ "runJSaddleBatch(" <> encode batch <> ");") (Nothing :: Maybe Cancellable) Nothing)
137+ webViewRunJavascript webView (decodeUtf8 . toStrict $ "runJSaddleBatch(" <> encode batch <> ");") noCancellable Nothing)
134 addJSaddleHandler webView processResults syncResults
140 addJSaddleHandler webView processResults syncResults
135− webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) (Nothing :: Maybe Cancellable) . Just $
141+ webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) noCancellable . Just $
136 \_obj _asyncResult ->
142 \_obj _asyncResult ->
137 void $ forkIO start
143 void $ forkIO start