Skip to content

Commit f5b8156

Browse files
sjrdsjrd
committed
Move everything from raw.* to dom.*.
We introduce deprecated aliases from `raw.*` to the corresponding elements of `dom.*`. The short aliases in `html.*`, `svg.*`, `webgl.*` and `idb.*` are kept. The aliases in `webworkers.*` are deprecated like `raw.*` since they are not shorter than the original names. The aliases in `css.*` are deprecated because the object `css` now conflicts with the DOM `CSS` global object on case-insensitive file systems. The aliases are not really shorter than the original names anyway.
1 parent f005384 commit f5b8156

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+47300
-46612
lines changed

‎api-reports/2_12.txt

Lines changed: 23137 additions & 23020 deletions
Large diffs are not rendered by default.

‎api-reports/2_13.txt

Lines changed: 23137 additions & 23020 deletions
Large diffs are not rendered by default.

‎src/main/scala/org/scalajs/dom/raw/Audio.scala renamed to ‎src/main/scala/org/scalajs/dom/Audio.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Everything else is under the MIT License
88
* http://opensource.org/licenses/MIT
99
*/
10-
package org.scalajs.dom.raw
10+
package org.scalajs.dom
1111

1212
import org.scalajs.dom.experimental.mediastream.MediaStream
1313
import scala.scalajs.js

‎src/main/scala/org/scalajs/dom/raw/Css.scala renamed to ‎src/main/scala/org/scalajs/dom/CSSTypes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Everything else is under the MIT License
88
* http://opensource.org/licenses/MIT
99
*/
10-
package org.scalajs.dom.raw
10+
package org.scalajs.dom
1111

1212
import scala.scalajs.js
1313
import scala.scalajs.js.annotation._

‎src/main/scala/org/scalajs/dom/DeprecatedCSSAliases.scala

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package org.scalajs.dom
2+
3+
import org.scalajs.dom
4+
5+
/**
6+
* Short aliases of all the dom.CSSThing classes
7+
*/
8+
@deprecated("directly use the dom.CSS* types and values instead", "2.0.0")
9+
object DeprecatedCSSAliases {
10+
@deprecated("use dom.CSS instead", "2.0.0")
11+
@inline def CSS = dom.CSS
12+
@deprecated("use dom.FontFaceRule instead", "2.0.0")
13+
type FontFaceRule = CSSFontFaceRule
14+
@deprecated("use dom.ImportRule instead", "2.0.0")
15+
type ImportRule = CSSImportRule
16+
@deprecated("use dom.KeyframeRule instead", "2.0.0")
17+
type KeyframeRule = CSSKeyframeRule
18+
@deprecated("use dom.MediaRule instead", "2.0.0")
19+
type MediaRule = CSSMediaRule
20+
@deprecated("use dom.NamespaceRule instead", "2.0.0")
21+
type NamespaceRule = CSSNamespaceRule
22+
@deprecated("use dom.PageRule instead", "2.0.0")
23+
type PageRule = CSSPageRule
24+
@deprecated("use dom.Rule instead", "2.0.0")
25+
type Rule = CSSRule
26+
@deprecated("use dom.Rule instead", "2.0.0")
27+
@inline def Rule = CSSRule
28+
@deprecated("use dom.RuleList instead", "2.0.0")
29+
type RuleList = CSSRuleList
30+
@deprecated("use dom.StyleDeclaration instead", "2.0.0")
31+
type StyleDeclaration = CSSStyleDeclaration
32+
@deprecated("use dom.StyleSheet instead", "2.0.0")
33+
type StyleSheet = CSSStyleSheet
34+
@deprecated("use dom.StyleRule instead", "2.0.0")
35+
type StyleRule = CSSStyleRule
36+
}

‎src/main/scala/org/scalajs/dom/raw/Html.scala renamed to ‎src/main/scala/org/scalajs/dom/HTMLTypes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Everything else is under the MIT License
88
* http://opensource.org/licenses/MIT
99
*/
10-
package org.scalajs.dom.raw
10+
package org.scalajs.dom
1111

1212
import org.scalajs.dom.experimental.mediastream.{MediaSource, MediaStream}
1313
import scala.scalajs.js

‎src/main/scala/org/scalajs/dom/raw/Idb.scala renamed to ‎src/main/scala/org/scalajs/dom/IDBTypes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Everything else is under the MIT License
88
* http://opensource.org/licenses/MIT
99
*/
10-
package org.scalajs.dom.raw
10+
package org.scalajs.dom
1111

1212
import scala.scalajs.js
1313
import scala.scalajs.js.annotation._

‎src/main/scala/org/scalajs/dom/raw/OffscreenCanvas.scala renamed to ‎src/main/scala/org/scalajs/dom/OffscreenCanvas.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.raw
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44
import scala.scalajs.js.annotation.JSGlobal

‎src/main/scala/org/scalajs/dom/raw/Svg.scala renamed to ‎src/main/scala/org/scalajs/dom/SVGTypes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Everything else is under the MIT License
88
* http://opensource.org/licenses/MIT
99
*/
10-
package org.scalajs.dom.raw
10+
package org.scalajs.dom
1111

1212
import scala.scalajs.js
1313
import scala.scalajs.js.annotation._

‎src/main/scala/org/scalajs/dom/raw/WebGL.scala renamed to ‎src/main/scala/org/scalajs/dom/WebGLTypes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Based on https://www.khronos.org/registry/webgl/specs/1.0/
55
*/
66

7-
package org.scalajs.dom.raw
7+
package org.scalajs.dom
88

99
import scala.scalajs.js
1010
import scala.scalajs.js.annotation._

‎src/main/scala/org/scalajs/dom/raw/WebWorkers.scala renamed to ‎src/main/scala/org/scalajs/dom/WebWorkerTypes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.raw
1+
package org.scalajs.dom
22

33
import scala.scalajs.js
44
import scala.scalajs.js.annotation._

‎src/main/scala/org/scalajs/dom/raw/WindowOrWorkerGlobalScope.scala renamed to ‎src/main/scala/org/scalajs/dom/WindowOrWorkerGlobalScope.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.raw
1+
package org.scalajs.dom
22

33
import org.scalajs.dom.experimental.cachestorage.CacheStorage
44
import org.scalajs.dom.experimental.{RequestInfo, RequestInit, Response}

‎src/main/scala/org/scalajs/dom/css.scala

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/main/scala/org/scalajs/dom/experimental/AbortController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.scalajs.dom.experimental
22

3-
import org.scalajs.dom.raw.EventTarget
3+
import org.scalajs.dom.EventTarget
44
import scala.scalajs.js
55
import scala.scalajs.js.annotation.JSGlobal
66

‎src/main/scala/org/scalajs/dom/experimental/Fetch.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.scalajs.dom.experimental
22

3-
import org.scalajs.dom.Blob
4-
import org.scalajs.dom.raw.FormData
3+
import org.scalajs.dom.{Blob, FormData}
54
import scala.scalajs.js
65
import scala.scalajs.js.annotation._
76
import scala.scalajs.js.typedarray.{ArrayBuffer, Uint8Array}

‎src/main/scala/org/scalajs/dom/experimental/FileReaderSync.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.scalajs.dom.experimental
22

3-
import org.scalajs.dom.raw.Blob
3+
import org.scalajs.dom.Blob
44
import scala.scalajs.js
55
import scala.scalajs.js.annotation._
66
import scala.scalajs.js.typedarray.ArrayBuffer

‎src/main/scala/org/scalajs/dom/experimental/Fullscreen.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.scalajs.dom.experimental
22

3-
import org.scalajs.dom.raw.{Document, Element, Event}
3+
import org.scalajs.dom.{Document, Element, Event}
44
import scala.language.implicitConversions
55
import scala.scalajs.js
66

‎src/main/scala/org/scalajs/dom/experimental/Notification.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.scalajs.dom.experimental
22

3-
import org.scalajs.dom.raw.EventTarget
3+
import org.scalajs.dom.EventTarget
44
import scala.scalajs.js
55
import scala.scalajs.js.annotation._
66

‎src/main/scala/org/scalajs/dom/experimental/PointerLock.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.scalajs.dom.experimental
22

3-
import org.scalajs.dom.raw.{Document, Element, Event, MouseEvent}
3+
import org.scalajs.dom.{Document, Element, Event, MouseEvent}
44
import scala.language.implicitConversions
55
import scala.scalajs.js
66

‎src/main/scala/org/scalajs/dom/experimental/beacon/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.scalajs.dom.experimental
22

3-
import org.scalajs.dom.raw.{Navigator, WorkerNavigator}
3+
import org.scalajs.dom.{Navigator, WorkerNavigator}
44
import scala.language.implicitConversions
55
import scala.scalajs.js
66

‎src/main/scala/org/scalajs/dom/experimental/deviceorientation/DeviceOrientation.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.scalajs.dom.experimental.deviceorientation
22

33
import org.scalajs.dom
4-
import org.scalajs.dom.raw.EventInit
4+
import org.scalajs.dom.EventInit
55
import scala.scalajs.js
66
import scala.scalajs.js.annotation._
77

‎src/main/scala/org/scalajs/dom/experimental/domparser/DOMParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.scalajs.dom.experimental.domparser
22

3-
import org.scalajs.dom.raw.Document
3+
import org.scalajs.dom.Document
44
import scala.scalajs.js
55
import scala.scalajs.js.annotation._
66

‎src/main/scala/org/scalajs/dom/experimental/gamepad/Gamepad.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package org.scalajs.dom.experimental.gamepad
88

99
import org.scalajs.dom
10-
import org.scalajs.dom.raw.EventInit
10+
import org.scalajs.dom.EventInit
1111
import scala.scalajs.js
1212
import scala.scalajs.js.annotation._
1313

‎src/main/scala/org/scalajs/dom/experimental/gamepad/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import scala.language.implicitConversions
99
* [[https://www.w3.org/TR/2015/WD-gamepad-20151217/ W3C Working Draft]]
1010
*/
1111
package object gamepad {
12-
implicit def toGamepad(navigator: dom.raw.Navigator): GamepadNavigator =
12+
implicit def toGamepad(navigator: dom.Navigator): GamepadNavigator =
1313
navigator.asInstanceOf[GamepadNavigator]
1414

1515
final val `unknown` = "".asInstanceOf[GamepadMappingType]

‎src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStream.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44
package org.scalajs.dom.experimental.mediastream
55

6-
import org.scalajs.dom.raw.{Event, EventInit, EventTarget, TimeRanges}
6+
import org.scalajs.dom.{Event, EventInit, EventTarget, TimeRanges}
77
import scala.scalajs.js
88
import scala.scalajs.js.annotation._
99
import scala.scalajs.js.|

‎src/main/scala/org/scalajs/dom/experimental/permissions/package.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package object permissions {
2020
val prompt = "prompt".asInstanceOf[PermissionState]
2121
}
2222

23-
trait PermissionStatus extends dom.raw.EventTarget {
23+
trait PermissionStatus extends dom.EventTarget {
2424
val state: PermissionState
2525
var onchange: js.Function1[dom.Event, _]
2626
}
@@ -73,8 +73,7 @@ package object permissions {
7373
val permissions: Permissions
7474
}
7575

76-
implicit def toPermissions(
77-
navigator: dom.raw.Navigator): PermissionsNavigator =
76+
implicit def toPermissions(navigator: dom.Navigator): PermissionsNavigator =
7877
navigator.asInstanceOf[PermissionsNavigator]
7978

8079
}

‎src/main/scala/org/scalajs/dom/experimental/push/PushManager.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.scalajs.dom.experimental.push
22

3+
import org.scalajs.dom.Blob
34
import org.scalajs.dom.experimental.serviceworkers.ExtendableEvent
4-
import org.scalajs.dom.raw.Blob
55
import scala.scalajs.js
66
import scala.scalajs.js.typedarray.{ArrayBuffer, Uint8Array}
77

‎src/main/scala/org/scalajs/dom/experimental/serviceworkers/ServiceWorkers.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package org.scalajs.dom.experimental.serviceworkers
33
import org.scalajs.dom.experimental.{
44
Notification, NotificationOptions, Request, Response, Sequence
55
}
6-
import org.scalajs.dom.raw.{EventInit, WorkerGlobalScope}
76
import org.scalajs.dom.webgl.RenderingContext
8-
import org.scalajs.dom.{Event, EventTarget, MessageEvent, MessagePort}
7+
import org.scalajs.dom.{
8+
Event, EventInit, EventTarget, MessageEvent, MessagePort, WorkerGlobalScope
9+
}
910
import scala.scalajs.js
1011
import scala.scalajs.js.annotation._
1112
import scala.scalajs.js.|

‎src/main/scala/org/scalajs/dom/experimental/serviceworkers/package.scala

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

3-
import org.scalajs.dom.raw.Navigator
3+
import org.scalajs.dom.Navigator
44
import scala.language.implicitConversions
55
import scala.scalajs.js
66
import scala.scalajs.js.|
@@ -16,7 +16,7 @@ package object serviceworkers {
1616
* [[https://html.spec.whatwg.org/multipage/infrastructure.html#transferable ¶2.7.4 Transferable Objects]]
1717
* in whatwg html spec.
1818
*/
19-
type Transferable = org.scalajs.dom.raw.Transferable | CanvasProxy
19+
type Transferable = org.scalajs.dom.Transferable | CanvasProxy
2020

2121
implicit def toServiceWorkerNavigator(n: Navigator): ServiceWorkerNavigator =
2222
n.asInstanceOf[ServiceWorkerNavigator]

‎src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorker.scala

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

3-
import org.scalajs.dom.raw.MessagePort
4-
import org.scalajs.dom.webworkers
3+
import org.scalajs.dom.{AbstractWorker, MessagePort}
54
import scala.scalajs.js
65
import scala.scalajs.js.annotation._
76

@@ -30,7 +29,7 @@ import scala.scalajs.js.annotation._
3029
@js.native
3130
@JSGlobal
3231
class SharedWorker(stringUrl: String, name: js.UndefOr[String] = js.native)
33-
extends webworkers.AbstractWorker {
32+
extends AbstractWorker {
3433

3534
/**
3635
* The port property of the SharedWorker interface returns a [[MessagePort]]

‎src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorkerGlobalScope.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.scalajs.dom.experimental.sharedworkers
22

33
import org.scalajs.dom.experimental.serviceworkers.ExtendableMessageEvent
4-
import org.scalajs.dom.raw.{ApplicationCache, WorkerGlobalScope}
4+
import org.scalajs.dom.{ApplicationCache, WorkerGlobalScope}
55
import scala.scalajs.js
66
import scala.scalajs.js.annotation._
77

‎src/main/scala/org/scalajs/dom/experimental/webgl/extensions/Extensions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.scalajs.dom.experimental.webgl.extensions
22

3-
import org.scalajs.dom.raw.WebGLShader
3+
import org.scalajs.dom.WebGLShader
44
import scala.scalajs.js
55

66
/**

‎src/main/scala/org/scalajs/dom/experimental/webgl/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.scalajs.dom.experimental
22

3-
import org.scalajs.dom.raw.WebGLRenderingContext
3+
import org.scalajs.dom.WebGLRenderingContext
44
import scala.scalajs.js
55

66
package object webgl {

‎src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
*/
44
package org.scalajs.dom.experimental.webrtc
55

6-
import org.scalajs.dom.Blob
76
import org.scalajs.dom.experimental.mediastream._
8-
import org.scalajs.dom.raw.{
9-
DOMException, Event, EventInit, EventTarget, MessageEvent
7+
import org.scalajs.dom.{
8+
Blob, DOMException, Event, EventInit, EventTarget, MessageEvent
109
}
1110
import scala.scalajs.js
1211
import scala.scalajs.js.annotation._

0 commit comments

Comments
 (0)