Skip to content

Commit 67034db

Browse files
committed
Declare top-level vals of dom as @js.native @JSGlobal.
1 parent f5b8156 commit 67034db

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

api-reports/2_12.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24786,10 +24786,10 @@ idb[SO] def Cursor = IDBCursor
2478624786
idb[SO] def KeyRange = IDBKeyRange
2478724787
idb[SO] def Transaction = IDBTransaction
2478824788
package[SO] type Transferable = ArrayBuffer | MessagePort
24789-
package[SO] lazy val console: Console
24789+
package[SO] @js.native @JSGlobal("console") val console: Console
2479024790
package[SO] lazy val css: DeprecatedCSSAliases.type (@deprecated in 2.0.0)
24791-
package[SO] lazy val document: html.Document
24792-
package[SO] lazy val window: Window
24791+
package[SO] @js.native @JSGlobal("document") val document: html.Document
24792+
package[SO] @js.native @JSGlobal("window") val window: Window
2479324793
raw[SO] type AbstractWorker = dom.AbstractWorker (@deprecated in 2.0.0)
2479424794
raw[SO] type AnalyserNode = dom.AnalyserNode (@deprecated in 2.0.0)
2479524795
raw[SO] type AnimationEvent = dom.AnimationEvent (@deprecated in 2.0.0)

api-reports/2_13.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24786,10 +24786,10 @@ idb[SO] def Cursor = IDBCursor
2478624786
idb[SO] def KeyRange = IDBKeyRange
2478724787
idb[SO] def Transaction = IDBTransaction
2478824788
package[SO] type Transferable = ArrayBuffer | MessagePort
24789-
package[SO] lazy val console: Console
24789+
package[SO] @js.native @JSGlobal("console") val console: Console
2479024790
package[SO] lazy val css: DeprecatedCSSAliases.type (@deprecated in 2.0.0)
24791-
package[SO] lazy val document: html.Document
24792-
package[SO] lazy val window: Window
24791+
package[SO] @js.native @JSGlobal("document") val document: html.Document
24792+
package[SO] @js.native @JSGlobal("window") val window: Window
2479324793
raw[SO] type AbstractWorker = dom.AbstractWorker (@deprecated in 2.0.0)
2479424794
raw[SO] type AnalyserNode = dom.AnalyserNode (@deprecated in 2.0.0)
2479524795
raw[SO] type AnimationEvent = dom.AnimationEvent (@deprecated in 2.0.0)

src/main/scala/org/scalajs/dom/package.scala

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.scalajs
22

33
import scala.scalajs.js
4+
import scala.scalajs.js.annotation._
45
import scala.scalajs.js.typedarray.ArrayBuffer
56
import scala.scalajs.js.|
67

@@ -20,10 +21,17 @@ package object dom {
2021
*/
2122
type Transferable = ArrayBuffer | MessagePort
2223

23-
lazy val window: Window = js.Dynamic.global.window.asInstanceOf[Window]
24-
lazy val document: html.Document = window.document
24+
@js.native
25+
@JSGlobal("window")
26+
val window: Window = js.native
2527

26-
lazy val console: Console = js.Dynamic.global.console.asInstanceOf[Console] // #411
28+
@js.native
29+
@JSGlobal("document")
30+
val document: html.Document = js.native
31+
32+
@js.native
33+
@JSGlobal("console")
34+
val console: Console = js.native
2735

2836
@deprecated("directly use the dom.CSS* types and values instead", "2.0.0")
2937
lazy val css: DeprecatedCSSAliases.type = DeprecatedCSSAliases

0 commit comments

Comments
 (0)