Skip to content

Commit eb0ef22

Browse files
committed
Make detection logic more robust
1 parent 0c1a7a6 commit eb0ef22

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

core/src/main/scala/org/scalajs/macrotaskexecutor/MacrotaskExecutor.scala

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,14 @@ object MacrotaskExecutor extends ExecutionContextExecutor {
134134
channel.port2.postMessage(handle)
135135
()
136136
}
137-
} else if (js.typeOf(js.Dynamic.global.Node) != Undefined) { // JSDOM sandbox
138-
val setImmediate = js.Dynamic.global.Node.constructor("return setImmediate")()
137+
} else if (
138+
js.typeOf(
139+
js.Dynamic.global.navigator
140+
) != Undefined && js.Dynamic.global.navigator.userAgent
141+
.asInstanceOf[js.UndefOr[String]]
142+
.exists(_.contains("jsdom"))
143+
) {
144+
val setImmediate = js.Dynamic.global.Node.constructor("return setImmediate")()
139145

140146
{ k =>
141147
setImmediate(k)

0 commit comments

Comments
 (0)