Skip to content

Commit e2cc047

Browse files
japgollyjapgolly
committed
Merge branch 'series/1.x' into WindowOrWorkerGlobalScope
2 parents db424e9 + 3796f5f commit e2cc047

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

‎api-reports/2_12.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ experimental/PointerLock.PointerLockDocument[JT] def pointerLockElement: Element
320320
experimental/PointerLock.PointerLockElement[JT] def requestPointerLock(): Unit
321321
experimental/PointerLock.PointerLockMouseEvent[JT] def movementX: Double
322322
experimental/PointerLock.PointerLockMouseEvent[JT] def movementY: Double
323-
experimental/ReadableStream[JT] def cancel(reason: String): js.Promise[Any]
323+
experimental/ReadableStream[JT] def cancel(reason: js.UndefOr[Any] = js.undefined): js.Promise[Unit]
324324
experimental/ReadableStream[JT] def getReader(): ReadableStreamReader[T]
325325
experimental/ReadableStream[JT] def locked: Boolean
326326
experimental/ReadableStream[JT] def pipeThrough[U](pair: Any, options: Any = js.undefined): ReadableStream[U]
@@ -469,7 +469,7 @@ experimental/WriteableState[SO] val closing = "closing".asInstanceOf[WriteableSt
469469
experimental/WriteableState[SO] val errored = "errored".asInstanceOf[WriteableState]
470470
experimental/WriteableState[SO] val waiting = "waiting".asInstanceOf[WriteableState]
471471
experimental/WriteableState[SO] val writable = "writable".asInstanceOf[WriteableState]
472-
experimental/WriteableStream[JT] def abort(reason: Any): Unit
472+
experimental/WriteableStream[JT] def abort(reason: js.UndefOr[Any] = js.undefined): js.Promise[Unit]
473473
experimental/WriteableStream[JT] def close(): js.Promise[WriteableStream[T]]
474474
experimental/WriteableStream[JT] val closed: js.Promise[WriteableStream[T]]
475475
experimental/WriteableStream[JT] val ready: js.Promise[WriteableStream[T]]
@@ -990,6 +990,7 @@ experimental/serviceworkers/FetchEvent[SC] def replacesClientId: String
990990
experimental/serviceworkers/FetchEvent[SC] def request: Request
991991
experimental/serviceworkers/FetchEvent[SC] def respondWith(promisedResponse: Response | js.Promise[Response]): Unit
992992
experimental/serviceworkers/FetchEvent[SC] def resultingClientId: String
993+
experimental/serviceworkers/FetchEvent[SC] def waitUntil(promise: js.Promise[Any]): Unit
993994
experimental/serviceworkers/FetchEventInit[JT] var bubbles: js.UndefOr[Boolean]
994995
experimental/serviceworkers/FetchEventInit[JT] var cancelable: js.UndefOr[Boolean]
995996
experimental/serviceworkers/FetchEventInit[JT] var clientId: js.UndefOr[String]

‎api-reports/2_13.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ experimental/PointerLock.PointerLockDocument[JT] def pointerLockElement: Element
320320
experimental/PointerLock.PointerLockElement[JT] def requestPointerLock(): Unit
321321
experimental/PointerLock.PointerLockMouseEvent[JT] def movementX: Double
322322
experimental/PointerLock.PointerLockMouseEvent[JT] def movementY: Double
323-
experimental/ReadableStream[JT] def cancel(reason: String): js.Promise[Any]
323+
experimental/ReadableStream[JT] def cancel(reason: js.UndefOr[Any] = js.undefined): js.Promise[Unit]
324324
experimental/ReadableStream[JT] def getReader(): ReadableStreamReader[T]
325325
experimental/ReadableStream[JT] def locked: Boolean
326326
experimental/ReadableStream[JT] def pipeThrough[U](pair: Any, options: Any = js.undefined): ReadableStream[U]
@@ -469,7 +469,7 @@ experimental/WriteableState[SO] val closing = "closing".asInstanceOf[WriteableSt
469469
experimental/WriteableState[SO] val errored = "errored".asInstanceOf[WriteableState]
470470
experimental/WriteableState[SO] val waiting = "waiting".asInstanceOf[WriteableState]
471471
experimental/WriteableState[SO] val writable = "writable".asInstanceOf[WriteableState]
472-
experimental/WriteableStream[JT] def abort(reason: Any): Unit
472+
experimental/WriteableStream[JT] def abort(reason: js.UndefOr[Any] = js.undefined): js.Promise[Unit]
473473
experimental/WriteableStream[JT] def close(): js.Promise[WriteableStream[T]]
474474
experimental/WriteableStream[JT] val closed: js.Promise[WriteableStream[T]]
475475
experimental/WriteableStream[JT] val ready: js.Promise[WriteableStream[T]]
@@ -990,6 +990,7 @@ experimental/serviceworkers/FetchEvent[SC] def replacesClientId: String
990990
experimental/serviceworkers/FetchEvent[SC] def request: Request
991991
experimental/serviceworkers/FetchEvent[SC] def respondWith(promisedResponse: Response | js.Promise[Response]): Unit
992992
experimental/serviceworkers/FetchEvent[SC] def resultingClientId: String
993+
experimental/serviceworkers/FetchEvent[SC] def waitUntil(promise: js.Promise[Any]): Unit
993994
experimental/serviceworkers/FetchEventInit[JT] var bubbles: js.UndefOr[Boolean]
994995
experimental/serviceworkers/FetchEventInit[JT] var cancelable: js.UndefOr[Boolean]
995996
experimental/serviceworkers/FetchEventInit[JT] var clientId: js.UndefOr[String]

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,10 @@ trait WriteableStream[-T] extends js.Object {
8787
* abort mechanism of the underlying sink.
8888
* see [[https://streams.spec.whatwg.org/#ws-abort ¶4.2.4.4. abort(reason)]]
8989
*
90-
* @param reason spec specifies Any (!?)
90+
* @param reason
9191
*/
92-
def abort(reason: Any): Unit = js.native
92+
def abort(
93+
reason: js.UndefOr[Any] = js.undefined): js.Promise[Unit] = js.native
9394

9495
/**
9596
* The close method signals that the producer is done writing chunks to the
@@ -148,10 +149,11 @@ trait ReadableStream[+T] extends js.Object {
148149
* the stream by a consumer. The supplied reason argument will be given to
149150
* the underlying source, which may or may not use it.
150151
*
151-
* @param reason the reason <- actually not what type this is
152-
* @return a Promise, but not quite sure what it can contain
152+
* @param reason the reason
153+
* @return a Promise
153154
*/
154-
def cancel(reason: String): js.Promise[Any] = js.native
155+
def cancel(
156+
reason: js.UndefOr[Any] = js.undefined): js.Promise[Unit] = js.native
155157

156158
/**
157159
* See [[https://streams.spec.whatwg.org/#rs-get-reader ¶3.2.4.3. getReader()]]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ trait CanvasProxy extends js.Any {
8181
def setContext(context: RenderingContext): Unit = js.native
8282
}
8383

84-
trait FetchEventInit extends EventInit {
84+
trait FetchEventInit extends ExtendableEventInit {
8585
var isReload: js.UndefOr[Boolean] = js.undefined
8686
var request: js.UndefOr[Request] = js.undefined
8787
var clientId: js.UndefOr[String] = js.undefined
@@ -96,7 +96,7 @@ trait FetchEventInit extends EventInit {
9696
@js.native
9797
@JSGlobal
9898
class FetchEvent(typeArg: String, init: js.UndefOr[FetchEventInit])
99-
extends Event(typeArg, init) {
99+
extends ExtendableEvent(typeArg, init) {
100100

101101
/**
102102
* Boolean that is true if the event was dispatched with the user's

0 commit comments

Comments
 (0)