From 161d44dd72c19dfff29271718bb13e3a66385688 Mon Sep 17 00:00:00 2001 From: unarist Date: Mon, 9 Sep 2019 21:49:12 +0900 Subject: [PATCH 1/3] Use Event type for IndexedDB errors --- src/main/scala/org/scalajs/dom/raw/Idb.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/org/scalajs/dom/raw/Idb.scala b/src/main/scala/org/scalajs/dom/raw/Idb.scala index f6ef5e53a..d71ed41e4 100644 --- a/src/main/scala/org/scalajs/dom/raw/Idb.scala +++ b/src/main/scala/org/scalajs/dom/raw/Idb.scala @@ -509,7 +509,7 @@ class IDBTransaction extends EventTarget { * * MDN */ - var onerror: js.Function1[ErrorEvent, _] = js.native + var onerror: js.Function1[Event, _] = js.native /** * The event handler for the onabort event. @@ -613,7 +613,7 @@ class IDBDatabase extends EventTarget { * * MDN */ - var onerror: js.Function1[ErrorEvent, _] = js.native + var onerror: js.Function1[Event, _] = js.native /** * Fires when access of the database is aborted. @@ -788,7 +788,7 @@ class IDBRequest extends EventTarget { * * MDN */ - var onerror: js.Function1[ErrorEvent, _] = js.native + var onerror: js.Function1[Event, _] = js.native /** * The state of the request. Every request starts in the pending state. The state From 1a0daecfd50bc5d77e2ccc53bb66a769ca6024d5 Mon Sep 17 00:00:00 2001 From: unarist Date: Mon, 9 Sep 2019 21:49:42 +0900 Subject: [PATCH 2/3] Use ProgressEvent for most XHR events --- src/main/scala/org/scalajs/dom/raw/lib.scala | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/scala/org/scalajs/dom/raw/lib.scala b/src/main/scala/org/scalajs/dom/raw/lib.scala index 77a6c1785..7c3ea80a3 100644 --- a/src/main/scala/org/scalajs/dom/raw/lib.scala +++ b/src/main/scala/org/scalajs/dom/raw/lib.scala @@ -4062,7 +4062,7 @@ class XMLHttpRequest extends EventTarget { */ def responseURL: js.UndefOr[String] = js.native - var ontimeout: js.Function1[Event, _] = js.native + var ontimeout: js.Function1[ProgressEvent, _] = js.native /** * The response string returned by the HTTP server. Unlike status, this includes the @@ -4082,7 +4082,7 @@ class XMLHttpRequest extends EventTarget { * MDN */ var timeout: Double = js.native - var onload: js.Function1[Event, _] = js.native + var onload: js.Function1[ProgressEvent, _] = js.native /** * Initializes a request. This method is to be used from JavaScript code; to @@ -4145,7 +4145,7 @@ class XMLHttpRequest extends EventTarget { */ var withCredentials: Boolean = js.native var onprogress: js.Function1[ProgressEvent, _] = js.native - var onabort: js.Function1[js.Any, _] = js.native + var onabort: js.Function1[ProgressEvent, _] = js.native /** * Can be set to change the response type. Value Data type of response property "" @@ -4181,8 +4181,8 @@ class XMLHttpRequest extends EventTarget { * MDN */ var upload: XMLHttpRequestEventTarget = js.native - var onerror: js.Function1[ErrorEvent, _] = js.native - var onloadstart: js.Function1[js.Any, _] = js.native + var onerror: js.Function1[ProgressEvent, _] = js.native + var onloadstart: js.Function1[ProgressEvent, _] = js.native } @js.native @@ -7274,7 +7274,7 @@ trait XMLHttpRequestEventTarget extends EventTarget { * * MDN */ - var onerror: js.Function1[ErrorEvent, _] = js.native + var onerror: js.Function1[ProgressEvent, _] = js.native /** * The function to call when an HTTP request returns after successfully loading @@ -7282,7 +7282,7 @@ trait XMLHttpRequestEventTarget extends EventTarget { * * MDN */ - var onload: js.Function1[js.Any, _] = js.native + var onload: js.Function1[ProgressEvent, _] = js.native /** * A function that is called if the event times out; this only happens if a timeout has @@ -7291,21 +7291,21 @@ trait XMLHttpRequestEventTarget extends EventTarget { * * MDN */ - var ontimeout: js.Function1[js.Any, _] = js.native + var ontimeout: js.Function1[ProgressEvent, _] = js.native /** * The function to call when a request is aborted. * * MDN */ - var onabort: js.Function1[js.Any, _] = js.native + var onabort: js.Function1[ProgressEvent, _] = js.native /** * A function that gets called when the HTTP request first begins loading data. * * MDN */ - var onloadstart: js.Function1[js.Any, _] = js.native + var onloadstart: js.Function1[ProgressEvent, _] = js.native /** * A function that is called when the load is completed, even if the request failed. From 24c07e43ace6ea98210b933294bdaa6b0fead37b Mon Sep 17 00:00:00 2001 From: David Barri Date: Fri, 20 Aug 2021 11:19:01 +1000 Subject: [PATCH 3/3] Run `sbt prePR` --- api-reports/2_12.txt | 28 ++++++++++++++-------------- api-reports/2_13.txt | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt index a115d22cf..3f4f8df0b 100644 --- a/api-reports/2_12.txt +++ b/api-reports/2_12.txt @@ -15128,7 +15128,7 @@ raw/IDBDatabase[JC] def dispatchEvent(evt: Event): Boolean raw/IDBDatabase[JC] def name: String raw/IDBDatabase[JC] def objectStoreNames: DOMStringList raw/IDBDatabase[JC] var onabort: js.Function1[Event, _] -raw/IDBDatabase[JC] var onerror: js.Function1[ErrorEvent, _] +raw/IDBDatabase[JC] var onerror: js.Function1[Event, _] raw/IDBDatabase[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit raw/IDBDatabase[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit raw/IDBDatabase[JC] def transaction(storeNames: js.Any, mode: String?): IDBTransaction @@ -15175,7 +15175,7 @@ raw/IDBOpenDBRequest[JC] def addEventListener[T <: Event](`type`: String, listen raw/IDBOpenDBRequest[JC] def dispatchEvent(evt: Event): Boolean raw/IDBOpenDBRequest[JC] def error: DOMException raw/IDBOpenDBRequest[JC] var onblocked: js.Function1[Event, _] -raw/IDBOpenDBRequest[JC] var onerror: js.Function1[ErrorEvent, _] +raw/IDBOpenDBRequest[JC] var onerror: js.Function1[Event, _] raw/IDBOpenDBRequest[JC] var onsuccess: js.Function1[Event, _] raw/IDBOpenDBRequest[JC] var onupgradeneeded: js.Function1[IDBVersionChangeEvent, _] raw/IDBOpenDBRequest[JC] def readyState: String @@ -15188,7 +15188,7 @@ raw/IDBRequest[JC] def addEventListener[T <: Event](`type`: String, listener: js raw/IDBRequest[JC] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit raw/IDBRequest[JC] def dispatchEvent(evt: Event): Boolean raw/IDBRequest[JC] def error: DOMException -raw/IDBRequest[JC] var onerror: js.Function1[ErrorEvent, _] +raw/IDBRequest[JC] var onerror: js.Function1[Event, _] raw/IDBRequest[JC] var onsuccess: js.Function1[Event, _] raw/IDBRequest[JC] def readyState: String raw/IDBRequest[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit @@ -15206,7 +15206,7 @@ raw/IDBTransaction[JC] def mode: String raw/IDBTransaction[JC] def objectStore(name: String): IDBObjectStore raw/IDBTransaction[JC] var onabort: js.Function1[Event, _] raw/IDBTransaction[JC] var oncomplete: js.Function1[Event, _] -raw/IDBTransaction[JC] var onerror: js.Function1[ErrorEvent, _] +raw/IDBTransaction[JC] var onerror: js.Function1[Event, _] raw/IDBTransaction[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit raw/IDBTransaction[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit raw/IDBTransaction[JO] val READ_ONLY: String @@ -24370,14 +24370,14 @@ raw/XMLHttpRequest[JC] def create(): XMLHttpRequest raw/XMLHttpRequest[JC] def dispatchEvent(evt: Event): Boolean raw/XMLHttpRequest[JC] def getAllResponseHeaders(): String raw/XMLHttpRequest[JC] def getResponseHeader(header: String): String -raw/XMLHttpRequest[JC] var onabort: js.Function1[js.Any, _] -raw/XMLHttpRequest[JC] var onerror: js.Function1[ErrorEvent, _] -raw/XMLHttpRequest[JC] var onload: js.Function1[Event, _] +raw/XMLHttpRequest[JC] var onabort: js.Function1[ProgressEvent, _] +raw/XMLHttpRequest[JC] var onerror: js.Function1[ProgressEvent, _] +raw/XMLHttpRequest[JC] var onload: js.Function1[ProgressEvent, _] raw/XMLHttpRequest[JC] var onloadend: js.Function1[ProgressEvent, _] -raw/XMLHttpRequest[JC] var onloadstart: js.Function1[js.Any, _] +raw/XMLHttpRequest[JC] var onloadstart: js.Function1[ProgressEvent, _] raw/XMLHttpRequest[JC] var onprogress: js.Function1[ProgressEvent, _] raw/XMLHttpRequest[JC] var onreadystatechange: js.Function1[Event, _] -raw/XMLHttpRequest[JC] var ontimeout: js.Function1[Event, _] +raw/XMLHttpRequest[JC] var ontimeout: js.Function1[ProgressEvent, _] raw/XMLHttpRequest[JC] def open(method: String, url: String, async: Boolean?, user: String?, password: String?): Unit raw/XMLHttpRequest[JC] def readyState: Int raw/XMLHttpRequest[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit @@ -24402,13 +24402,13 @@ raw/XMLHttpRequest[JO] var UNSENT: Int raw/XMLHttpRequestEventTarget[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit raw/XMLHttpRequestEventTarget[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit raw/XMLHttpRequestEventTarget[JT] def dispatchEvent(evt: Event): Boolean -raw/XMLHttpRequestEventTarget[JT] var onabort: js.Function1[js.Any, _] -raw/XMLHttpRequestEventTarget[JT] var onerror: js.Function1[ErrorEvent, _] -raw/XMLHttpRequestEventTarget[JT] var onload: js.Function1[js.Any, _] +raw/XMLHttpRequestEventTarget[JT] var onabort: js.Function1[ProgressEvent, _] +raw/XMLHttpRequestEventTarget[JT] var onerror: js.Function1[ProgressEvent, _] +raw/XMLHttpRequestEventTarget[JT] var onload: js.Function1[ProgressEvent, _] raw/XMLHttpRequestEventTarget[JT] var onloadend: js.Function1[ProgressEvent, _] -raw/XMLHttpRequestEventTarget[JT] var onloadstart: js.Function1[js.Any, _] +raw/XMLHttpRequestEventTarget[JT] var onloadstart: js.Function1[ProgressEvent, _] raw/XMLHttpRequestEventTarget[JT] var onprogress: js.Function1[ProgressEvent, _] -raw/XMLHttpRequestEventTarget[JT] var ontimeout: js.Function1[js.Any, _] +raw/XMLHttpRequestEventTarget[JT] var ontimeout: js.Function1[ProgressEvent, _] raw/XMLHttpRequestEventTarget[JT] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit raw/XMLHttpRequestEventTarget[JT] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit raw/XMLSerializer[JC] def serializeToString(target: Node): String diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt index d6dbf8bce..f726af3aa 100644 --- a/api-reports/2_13.txt +++ b/api-reports/2_13.txt @@ -15128,7 +15128,7 @@ raw/IDBDatabase[JC] def dispatchEvent(evt: Event): Boolean raw/IDBDatabase[JC] def name: String raw/IDBDatabase[JC] def objectStoreNames: DOMStringList raw/IDBDatabase[JC] var onabort: js.Function1[Event, _] -raw/IDBDatabase[JC] var onerror: js.Function1[ErrorEvent, _] +raw/IDBDatabase[JC] var onerror: js.Function1[Event, _] raw/IDBDatabase[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit raw/IDBDatabase[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit raw/IDBDatabase[JC] def transaction(storeNames: js.Any, mode: String?): IDBTransaction @@ -15175,7 +15175,7 @@ raw/IDBOpenDBRequest[JC] def addEventListener[T <: Event](`type`: String, listen raw/IDBOpenDBRequest[JC] def dispatchEvent(evt: Event): Boolean raw/IDBOpenDBRequest[JC] def error: DOMException raw/IDBOpenDBRequest[JC] var onblocked: js.Function1[Event, _] -raw/IDBOpenDBRequest[JC] var onerror: js.Function1[ErrorEvent, _] +raw/IDBOpenDBRequest[JC] var onerror: js.Function1[Event, _] raw/IDBOpenDBRequest[JC] var onsuccess: js.Function1[Event, _] raw/IDBOpenDBRequest[JC] var onupgradeneeded: js.Function1[IDBVersionChangeEvent, _] raw/IDBOpenDBRequest[JC] def readyState: String @@ -15188,7 +15188,7 @@ raw/IDBRequest[JC] def addEventListener[T <: Event](`type`: String, listener: js raw/IDBRequest[JC] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit raw/IDBRequest[JC] def dispatchEvent(evt: Event): Boolean raw/IDBRequest[JC] def error: DOMException -raw/IDBRequest[JC] var onerror: js.Function1[ErrorEvent, _] +raw/IDBRequest[JC] var onerror: js.Function1[Event, _] raw/IDBRequest[JC] var onsuccess: js.Function1[Event, _] raw/IDBRequest[JC] def readyState: String raw/IDBRequest[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit @@ -15206,7 +15206,7 @@ raw/IDBTransaction[JC] def mode: String raw/IDBTransaction[JC] def objectStore(name: String): IDBObjectStore raw/IDBTransaction[JC] var onabort: js.Function1[Event, _] raw/IDBTransaction[JC] var oncomplete: js.Function1[Event, _] -raw/IDBTransaction[JC] var onerror: js.Function1[ErrorEvent, _] +raw/IDBTransaction[JC] var onerror: js.Function1[Event, _] raw/IDBTransaction[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit raw/IDBTransaction[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit raw/IDBTransaction[JO] val READ_ONLY: String @@ -24370,14 +24370,14 @@ raw/XMLHttpRequest[JC] def create(): XMLHttpRequest raw/XMLHttpRequest[JC] def dispatchEvent(evt: Event): Boolean raw/XMLHttpRequest[JC] def getAllResponseHeaders(): String raw/XMLHttpRequest[JC] def getResponseHeader(header: String): String -raw/XMLHttpRequest[JC] var onabort: js.Function1[js.Any, _] -raw/XMLHttpRequest[JC] var onerror: js.Function1[ErrorEvent, _] -raw/XMLHttpRequest[JC] var onload: js.Function1[Event, _] +raw/XMLHttpRequest[JC] var onabort: js.Function1[ProgressEvent, _] +raw/XMLHttpRequest[JC] var onerror: js.Function1[ProgressEvent, _] +raw/XMLHttpRequest[JC] var onload: js.Function1[ProgressEvent, _] raw/XMLHttpRequest[JC] var onloadend: js.Function1[ProgressEvent, _] -raw/XMLHttpRequest[JC] var onloadstart: js.Function1[js.Any, _] +raw/XMLHttpRequest[JC] var onloadstart: js.Function1[ProgressEvent, _] raw/XMLHttpRequest[JC] var onprogress: js.Function1[ProgressEvent, _] raw/XMLHttpRequest[JC] var onreadystatechange: js.Function1[Event, _] -raw/XMLHttpRequest[JC] var ontimeout: js.Function1[Event, _] +raw/XMLHttpRequest[JC] var ontimeout: js.Function1[ProgressEvent, _] raw/XMLHttpRequest[JC] def open(method: String, url: String, async: Boolean?, user: String?, password: String?): Unit raw/XMLHttpRequest[JC] def readyState: Int raw/XMLHttpRequest[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit @@ -24402,13 +24402,13 @@ raw/XMLHttpRequest[JO] var UNSENT: Int raw/XMLHttpRequestEventTarget[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit raw/XMLHttpRequestEventTarget[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit raw/XMLHttpRequestEventTarget[JT] def dispatchEvent(evt: Event): Boolean -raw/XMLHttpRequestEventTarget[JT] var onabort: js.Function1[js.Any, _] -raw/XMLHttpRequestEventTarget[JT] var onerror: js.Function1[ErrorEvent, _] -raw/XMLHttpRequestEventTarget[JT] var onload: js.Function1[js.Any, _] +raw/XMLHttpRequestEventTarget[JT] var onabort: js.Function1[ProgressEvent, _] +raw/XMLHttpRequestEventTarget[JT] var onerror: js.Function1[ProgressEvent, _] +raw/XMLHttpRequestEventTarget[JT] var onload: js.Function1[ProgressEvent, _] raw/XMLHttpRequestEventTarget[JT] var onloadend: js.Function1[ProgressEvent, _] -raw/XMLHttpRequestEventTarget[JT] var onloadstart: js.Function1[js.Any, _] +raw/XMLHttpRequestEventTarget[JT] var onloadstart: js.Function1[ProgressEvent, _] raw/XMLHttpRequestEventTarget[JT] var onprogress: js.Function1[ProgressEvent, _] -raw/XMLHttpRequestEventTarget[JT] var ontimeout: js.Function1[js.Any, _] +raw/XMLHttpRequestEventTarget[JT] var ontimeout: js.Function1[ProgressEvent, _] raw/XMLHttpRequestEventTarget[JT] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit raw/XMLHttpRequestEventTarget[JT] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit raw/XMLSerializer[JC] def serializeToString(target: Node): String