git.iko.soy/jsaddle
on 243d63f help sign in
376df8e
swap
0 ahead, 9 behind
jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+3−9
since splitsnapshots
unifiedsplit
@@ -82,12 +82,6 @@ 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)
84
84
85−noAdjustment :: Maybe Adjustment
86−noAdjustment = Nothing
87−
88−noCancellable :: Maybe Cancellable
89−noCancellable = Nothing
90−
91quitWebView :: WebView -> IO ()
85quitWebView :: WebView -> IO ()
92quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?
86quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?
93 widgetDestroy w
87 widgetDestroy w
@@ -110,7 +104,7 @@ run main = do
110 _ <- timeoutAdd PRIORITY_HIGH 10 (yield >> return True)
104 _ <- timeoutAdd PRIORITY_HIGH 10 (yield >> return True)
111 windowSetDefaultSize window 900 600
105 windowSetDefaultSize window 900 600
112 windowSetPosition window WindowPositionCenter
106 windowSetPosition window WindowPositionCenter
113− scrollWin <- scrolledWindowNew noAdjustment noAdjustment
107+ scrollWin <- scrolledWindowNew (Nothing :: Maybe Adjustment) (Nothing :: Maybe Adjustment)
114 contentManager <- userContentManagerNew
108 contentManager <- userContentManagerNew
115 webView <- webViewNewWithUserContentManager contentManager
109 webView <- webViewNewWithUserContentManager contentManager
116 settings <- webViewGetSettings webView
110 settings <- webViewGetSettings webView
@@ -134,11 +128,11 @@ run main = do
134runInWebView :: JSM () -> WebView -> IO ()
128runInWebView :: JSM () -> WebView -> IO ()
135runInWebView f webView = do
129runInWebView f webView = do
136 (processResults, syncResults, start) <- runJavaScript (\batch -> postGUIAsync $
130 (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)
138 f
132 f
139
133
140 addJSaddleHandler webView processResults syncResults
134 addJSaddleHandler webView processResults syncResults
141− webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) noCancellable . Just $
135+ webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) (Nothing :: Maybe Cancellable) . Just $
142 \_obj _asyncResult ->
136 \_obj _asyncResult ->
143 void $ forkIO start
137 void $ forkIO start
144
138
jsaddle/jsaddle.cabal+1−1
@@ -10,7 +10,7 @@ description:
10 This package provides an EDSL for calling JavaScript that
10 This package provides an EDSL for calling JavaScript that
11 can be used both from GHCJS and GHC. When using GHC
11 can be used both from GHCJS and GHC. When using GHC
12 the application is run using Warp and WebSockets to
12 the application is run using Warp and WebSockets to
13− drive a small JavaScript helper.
13+ drive a small JavaScipt helper.
14category: Web, Javascript
14category: Web, Javascript
15author: Hamish Mackenzie
15author: Hamish Mackenzie
16
16
jsaddle/src/Language/Javascript/JSaddle/Object.hs+4−3
@@ -526,11 +526,12 @@ array args = do
526 Object . coerce <$> fromListIO rargs
526 Object . coerce <$> fromListIO rargs
527
527
528-- | JavaScript's global object
528-- | JavaScript's global object
529+global :: Object
529#ifdef ghcjs_HOST_OS
530#ifdef ghcjs_HOST_OS
531+global = js_window
530−foreign import javascript unsafe "$r = globalThis"
532+foreign import javascript unsafe "$r = window"
531− global :: Object
533+ js_window :: Object
532#else
534#else
533−global :: Object
534global = Object . JSVal . unsafePerformIO $ newIORef 4
535global = Object . JSVal . unsafePerformIO $ newIORef 4
535#endif
536#endif
536
537
jsaddle/src/Language/Javascript/JSaddle/Run/Files.hs+1−1
@@ -41,7 +41,7 @@ initState = "\
41 \ jsaddle_values.set(1, undefined);\n\
41 \ jsaddle_values.set(1, undefined);\n\
42 \ jsaddle_values.set(2, false);\n\
42 \ jsaddle_values.set(2, false);\n\
43 \ jsaddle_values.set(3, true);\n\
43 \ jsaddle_values.set(3, true);\n\
44− \ jsaddle_values.set(4, globalThis);\n\
44+ \ jsaddle_values.set(4, window);\n\
45 \ var jsaddle_index = 100;\n\
45 \ var jsaddle_index = 100;\n\
46 \ var expectedBatch = 1;\n\
46 \ var expectedBatch = 1;\n\
47 \ var lastResults = [0, {\"tag\": \"Success\", \"contents\": [[], []]}];\n\
47 \ var lastResults = [0, {\"tag\": \"Success\", \"contents\": [[], []]}];\n\