git.iko.soy/jsaddle
on master help sign in
Change window to globalThis for node
5d3371aHamish Mackenzie
jsaddle/src/Language/Javascript/JSaddle/Object.hs+2−3
compare with master
unifiedsplit
@@ -528,9 +528,8 @@ array args = do
528-- | JavaScript's global object
528-- | JavaScript's global object
529global :: Object
529global :: Object
530#ifdef ghcjs_HOST_OS
530#ifdef ghcjs_HOST_OS
531−global = js_window
532−foreign import javascript unsafe "$r = window"
531+foreign import javascript unsafe "$r = globalThis"
533− js_window :: Object
532+ global :: Object
534#else
533#else
535global = Object . JSVal . unsafePerformIO $ newIORef 4
534global = Object . JSVal . unsafePerformIO $ newIORef 4
536#endif
535#endif
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, window);\n\
44+ \ jsaddle_values.set(4, globalThis);\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\