git.iko.soy/jsaddle
on master help sign in
Change window to globalThis for node
commit5d3371a41c4a56207b392c5396ddb067e13f3193 authorHamish Mackenzie <Hamish.K.Mackenzie@gmail.com> dateThu 27 May 2021, 17:39 (5 years ago) parent243d63f
2 files changed+3−4
compare with master
unifiedsplit
jsaddle/src/Language/Javascript/JSaddle/Object.hs+2−3 jsaddle/src/Language/Javascript/JSaddle/Run/Files.hs+1−1
jsaddle/src/Language/Javascript/JSaddle/Object.hs+2−3
@@ -528,9 +528,8 @@ array args = do
528528-- | JavaScript's global object
529529global :: Object
530530#ifdef ghcjs_HOST_OS
531−global = js_window
532−foreign import javascript unsafe "$r = window"
533− js_window :: Object
531+foreign import javascript unsafe "$r = globalThis"
532+ global :: Object
534533#else
535534global = Object . JSVal . unsafePerformIO $ newIORef 4
536535#endif
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, window);\n\
44+ \ jsaddle_values.set(4, globalThis);\n\
4545 \ var jsaddle_index = 100;\n\
4646 \ var expectedBatch = 1;\n\
4747 \ var lastResults = [0, {\"tag\": \"Success\", \"contents\": [[], []]}];\n\