Skip to content

Commit 8d20699

Browse files
japgollyjapgolly
authored
Merge pull request #379 from unarist/error-event
Fix misuse of ErrorEvent
2 parents f37bf0d + 24c07e4 commit 8d20699

File tree

4 files changed

+41
-41
lines changed

4 files changed

+41
-41
lines changed

‎api-reports/2_12.txt

+14-14
Original file line numberDiff line numberDiff line change
@@ -15128,7 +15128,7 @@ raw/IDBDatabase[JC] def dispatchEvent(evt: Event): Boolean
1512815128
raw/IDBDatabase[JC] def name: String
1512915129
raw/IDBDatabase[JC] def objectStoreNames: DOMStringList
1513015130
raw/IDBDatabase[JC] var onabort: js.Function1[Event, _]
15131-
raw/IDBDatabase[JC] var onerror: js.Function1[ErrorEvent, _]
15131+
raw/IDBDatabase[JC] var onerror: js.Function1[Event, _]
1513215132
raw/IDBDatabase[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
1513315133
raw/IDBDatabase[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
1513415134
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
1517515175
raw/IDBOpenDBRequest[JC] def dispatchEvent(evt: Event): Boolean
1517615176
raw/IDBOpenDBRequest[JC] def error: DOMException
1517715177
raw/IDBOpenDBRequest[JC] var onblocked: js.Function1[Event, _]
15178-
raw/IDBOpenDBRequest[JC] var onerror: js.Function1[ErrorEvent, _]
15178+
raw/IDBOpenDBRequest[JC] var onerror: js.Function1[Event, _]
1517915179
raw/IDBOpenDBRequest[JC] var onsuccess: js.Function1[Event, _]
1518015180
raw/IDBOpenDBRequest[JC] var onupgradeneeded: js.Function1[IDBVersionChangeEvent, _]
1518115181
raw/IDBOpenDBRequest[JC] def readyState: String
@@ -15188,7 +15188,7 @@ raw/IDBRequest[JC] def addEventListener[T <: Event](`type`: String, listener: js
1518815188
raw/IDBRequest[JC] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
1518915189
raw/IDBRequest[JC] def dispatchEvent(evt: Event): Boolean
1519015190
raw/IDBRequest[JC] def error: DOMException
15191-
raw/IDBRequest[JC] var onerror: js.Function1[ErrorEvent, _]
15191+
raw/IDBRequest[JC] var onerror: js.Function1[Event, _]
1519215192
raw/IDBRequest[JC] var onsuccess: js.Function1[Event, _]
1519315193
raw/IDBRequest[JC] def readyState: String
1519415194
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
1520615206
raw/IDBTransaction[JC] def objectStore(name: String): IDBObjectStore
1520715207
raw/IDBTransaction[JC] var onabort: js.Function1[Event, _]
1520815208
raw/IDBTransaction[JC] var oncomplete: js.Function1[Event, _]
15209-
raw/IDBTransaction[JC] var onerror: js.Function1[ErrorEvent, _]
15209+
raw/IDBTransaction[JC] var onerror: js.Function1[Event, _]
1521015210
raw/IDBTransaction[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
1521115211
raw/IDBTransaction[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
1521215212
raw/IDBTransaction[JO] val READ_ONLY: String
@@ -24370,14 +24370,14 @@ raw/XMLHttpRequest[JC] def create(): XMLHttpRequest
2437024370
raw/XMLHttpRequest[JC] def dispatchEvent(evt: Event): Boolean
2437124371
raw/XMLHttpRequest[JC] def getAllResponseHeaders(): String
2437224372
raw/XMLHttpRequest[JC] def getResponseHeader(header: String): String
24373-
raw/XMLHttpRequest[JC] var onabort: js.Function1[js.Any, _]
24374-
raw/XMLHttpRequest[JC] var onerror: js.Function1[ErrorEvent, _]
24375-
raw/XMLHttpRequest[JC] var onload: js.Function1[Event, _]
24373+
raw/XMLHttpRequest[JC] var onabort: js.Function1[ProgressEvent, _]
24374+
raw/XMLHttpRequest[JC] var onerror: js.Function1[ProgressEvent, _]
24375+
raw/XMLHttpRequest[JC] var onload: js.Function1[ProgressEvent, _]
2437624376
raw/XMLHttpRequest[JC] var onloadend: js.Function1[ProgressEvent, _]
24377-
raw/XMLHttpRequest[JC] var onloadstart: js.Function1[js.Any, _]
24377+
raw/XMLHttpRequest[JC] var onloadstart: js.Function1[ProgressEvent, _]
2437824378
raw/XMLHttpRequest[JC] var onprogress: js.Function1[ProgressEvent, _]
2437924379
raw/XMLHttpRequest[JC] var onreadystatechange: js.Function1[Event, _]
24380-
raw/XMLHttpRequest[JC] var ontimeout: js.Function1[Event, _]
24380+
raw/XMLHttpRequest[JC] var ontimeout: js.Function1[ProgressEvent, _]
2438124381
raw/XMLHttpRequest[JC] def open(method: String, url: String, async: Boolean?, user: String?, password: String?): Unit
2438224382
raw/XMLHttpRequest[JC] def readyState: Int
2438324383
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
2440224402
raw/XMLHttpRequestEventTarget[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
2440324403
raw/XMLHttpRequestEventTarget[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
2440424404
raw/XMLHttpRequestEventTarget[JT] def dispatchEvent(evt: Event): Boolean
24405-
raw/XMLHttpRequestEventTarget[JT] var onabort: js.Function1[js.Any, _]
24406-
raw/XMLHttpRequestEventTarget[JT] var onerror: js.Function1[ErrorEvent, _]
24407-
raw/XMLHttpRequestEventTarget[JT] var onload: js.Function1[js.Any, _]
24405+
raw/XMLHttpRequestEventTarget[JT] var onabort: js.Function1[ProgressEvent, _]
24406+
raw/XMLHttpRequestEventTarget[JT] var onerror: js.Function1[ProgressEvent, _]
24407+
raw/XMLHttpRequestEventTarget[JT] var onload: js.Function1[ProgressEvent, _]
2440824408
raw/XMLHttpRequestEventTarget[JT] var onloadend: js.Function1[ProgressEvent, _]
24409-
raw/XMLHttpRequestEventTarget[JT] var onloadstart: js.Function1[js.Any, _]
24409+
raw/XMLHttpRequestEventTarget[JT] var onloadstart: js.Function1[ProgressEvent, _]
2441024410
raw/XMLHttpRequestEventTarget[JT] var onprogress: js.Function1[ProgressEvent, _]
24411-
raw/XMLHttpRequestEventTarget[JT] var ontimeout: js.Function1[js.Any, _]
24411+
raw/XMLHttpRequestEventTarget[JT] var ontimeout: js.Function1[ProgressEvent, _]
2441224412
raw/XMLHttpRequestEventTarget[JT] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
2441324413
raw/XMLHttpRequestEventTarget[JT] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
2441424414
raw/XMLSerializer[JC] def serializeToString(target: Node): String

‎api-reports/2_13.txt

+14-14
Original file line numberDiff line numberDiff line change
@@ -15128,7 +15128,7 @@ raw/IDBDatabase[JC] def dispatchEvent(evt: Event): Boolean
1512815128
raw/IDBDatabase[JC] def name: String
1512915129
raw/IDBDatabase[JC] def objectStoreNames: DOMStringList
1513015130
raw/IDBDatabase[JC] var onabort: js.Function1[Event, _]
15131-
raw/IDBDatabase[JC] var onerror: js.Function1[ErrorEvent, _]
15131+
raw/IDBDatabase[JC] var onerror: js.Function1[Event, _]
1513215132
raw/IDBDatabase[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
1513315133
raw/IDBDatabase[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
1513415134
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
1517515175
raw/IDBOpenDBRequest[JC] def dispatchEvent(evt: Event): Boolean
1517615176
raw/IDBOpenDBRequest[JC] def error: DOMException
1517715177
raw/IDBOpenDBRequest[JC] var onblocked: js.Function1[Event, _]
15178-
raw/IDBOpenDBRequest[JC] var onerror: js.Function1[ErrorEvent, _]
15178+
raw/IDBOpenDBRequest[JC] var onerror: js.Function1[Event, _]
1517915179
raw/IDBOpenDBRequest[JC] var onsuccess: js.Function1[Event, _]
1518015180
raw/IDBOpenDBRequest[JC] var onupgradeneeded: js.Function1[IDBVersionChangeEvent, _]
1518115181
raw/IDBOpenDBRequest[JC] def readyState: String
@@ -15188,7 +15188,7 @@ raw/IDBRequest[JC] def addEventListener[T <: Event](`type`: String, listener: js
1518815188
raw/IDBRequest[JC] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
1518915189
raw/IDBRequest[JC] def dispatchEvent(evt: Event): Boolean
1519015190
raw/IDBRequest[JC] def error: DOMException
15191-
raw/IDBRequest[JC] var onerror: js.Function1[ErrorEvent, _]
15191+
raw/IDBRequest[JC] var onerror: js.Function1[Event, _]
1519215192
raw/IDBRequest[JC] var onsuccess: js.Function1[Event, _]
1519315193
raw/IDBRequest[JC] def readyState: String
1519415194
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
1520615206
raw/IDBTransaction[JC] def objectStore(name: String): IDBObjectStore
1520715207
raw/IDBTransaction[JC] var onabort: js.Function1[Event, _]
1520815208
raw/IDBTransaction[JC] var oncomplete: js.Function1[Event, _]
15209-
raw/IDBTransaction[JC] var onerror: js.Function1[ErrorEvent, _]
15209+
raw/IDBTransaction[JC] var onerror: js.Function1[Event, _]
1521015210
raw/IDBTransaction[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
1521115211
raw/IDBTransaction[JC] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
1521215212
raw/IDBTransaction[JO] val READ_ONLY: String
@@ -24370,14 +24370,14 @@ raw/XMLHttpRequest[JC] def create(): XMLHttpRequest
2437024370
raw/XMLHttpRequest[JC] def dispatchEvent(evt: Event): Boolean
2437124371
raw/XMLHttpRequest[JC] def getAllResponseHeaders(): String
2437224372
raw/XMLHttpRequest[JC] def getResponseHeader(header: String): String
24373-
raw/XMLHttpRequest[JC] var onabort: js.Function1[js.Any, _]
24374-
raw/XMLHttpRequest[JC] var onerror: js.Function1[ErrorEvent, _]
24375-
raw/XMLHttpRequest[JC] var onload: js.Function1[Event, _]
24373+
raw/XMLHttpRequest[JC] var onabort: js.Function1[ProgressEvent, _]
24374+
raw/XMLHttpRequest[JC] var onerror: js.Function1[ProgressEvent, _]
24375+
raw/XMLHttpRequest[JC] var onload: js.Function1[ProgressEvent, _]
2437624376
raw/XMLHttpRequest[JC] var onloadend: js.Function1[ProgressEvent, _]
24377-
raw/XMLHttpRequest[JC] var onloadstart: js.Function1[js.Any, _]
24377+
raw/XMLHttpRequest[JC] var onloadstart: js.Function1[ProgressEvent, _]
2437824378
raw/XMLHttpRequest[JC] var onprogress: js.Function1[ProgressEvent, _]
2437924379
raw/XMLHttpRequest[JC] var onreadystatechange: js.Function1[Event, _]
24380-
raw/XMLHttpRequest[JC] var ontimeout: js.Function1[Event, _]
24380+
raw/XMLHttpRequest[JC] var ontimeout: js.Function1[ProgressEvent, _]
2438124381
raw/XMLHttpRequest[JC] def open(method: String, url: String, async: Boolean?, user: String?, password: String?): Unit
2438224382
raw/XMLHttpRequest[JC] def readyState: Int
2438324383
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
2440224402
raw/XMLHttpRequestEventTarget[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
2440324403
raw/XMLHttpRequestEventTarget[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
2440424404
raw/XMLHttpRequestEventTarget[JT] def dispatchEvent(evt: Event): Boolean
24405-
raw/XMLHttpRequestEventTarget[JT] var onabort: js.Function1[js.Any, _]
24406-
raw/XMLHttpRequestEventTarget[JT] var onerror: js.Function1[ErrorEvent, _]
24407-
raw/XMLHttpRequestEventTarget[JT] var onload: js.Function1[js.Any, _]
24405+
raw/XMLHttpRequestEventTarget[JT] var onabort: js.Function1[ProgressEvent, _]
24406+
raw/XMLHttpRequestEventTarget[JT] var onerror: js.Function1[ProgressEvent, _]
24407+
raw/XMLHttpRequestEventTarget[JT] var onload: js.Function1[ProgressEvent, _]
2440824408
raw/XMLHttpRequestEventTarget[JT] var onloadend: js.Function1[ProgressEvent, _]
24409-
raw/XMLHttpRequestEventTarget[JT] var onloadstart: js.Function1[js.Any, _]
24409+
raw/XMLHttpRequestEventTarget[JT] var onloadstart: js.Function1[ProgressEvent, _]
2441024410
raw/XMLHttpRequestEventTarget[JT] var onprogress: js.Function1[ProgressEvent, _]
24411-
raw/XMLHttpRequestEventTarget[JT] var ontimeout: js.Function1[js.Any, _]
24411+
raw/XMLHttpRequestEventTarget[JT] var ontimeout: js.Function1[ProgressEvent, _]
2441224412
raw/XMLHttpRequestEventTarget[JT] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
2441324413
raw/XMLHttpRequestEventTarget[JT] def removeEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
2441424414
raw/XMLSerializer[JC] def serializeToString(target: Node): String

‎src/main/scala/org/scalajs/dom/raw/Idb.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ class IDBTransaction extends EventTarget {
509509
*
510510
* MDN
511511
*/
512-
var onerror: js.Function1[ErrorEvent, _] = js.native
512+
var onerror: js.Function1[Event, _] = js.native
513513

514514
/**
515515
* The event handler for the onabort event.
@@ -613,7 +613,7 @@ class IDBDatabase extends EventTarget {
613613
*
614614
* MDN
615615
*/
616-
var onerror: js.Function1[ErrorEvent, _] = js.native
616+
var onerror: js.Function1[Event, _] = js.native
617617

618618
/**
619619
* Fires when access of the database is aborted.
@@ -788,7 +788,7 @@ class IDBRequest extends EventTarget {
788788
*
789789
* MDN
790790
*/
791-
var onerror: js.Function1[ErrorEvent, _] = js.native
791+
var onerror: js.Function1[Event, _] = js.native
792792

793793
/**
794794
* The state of the request. Every request starts in the pending state. The state

‎src/main/scala/org/scalajs/dom/raw/lib.scala

+10-10
Original file line numberDiff line numberDiff line change
@@ -4104,7 +4104,7 @@ class XMLHttpRequest extends EventTarget {
41044104
*/
41054105
def responseURL: js.UndefOr[String] = js.native
41064106

4107-
var ontimeout: js.Function1[Event, _] = js.native
4107+
var ontimeout: js.Function1[ProgressEvent, _] = js.native
41084108

41094109
/**
41104110
* The response string returned by the HTTP server. Unlike status, this includes the
@@ -4124,7 +4124,7 @@ class XMLHttpRequest extends EventTarget {
41244124
* MDN
41254125
*/
41264126
var timeout: Double = js.native
4127-
var onload: js.Function1[Event, _] = js.native
4127+
var onload: js.Function1[ProgressEvent, _] = js.native
41284128

41294129
/**
41304130
* Initializes a request. This method is to be used from JavaScript code; to
@@ -4187,7 +4187,7 @@ class XMLHttpRequest extends EventTarget {
41874187
*/
41884188
var withCredentials: Boolean = js.native
41894189
var onprogress: js.Function1[ProgressEvent, _] = js.native
4190-
var onabort: js.Function1[js.Any, _] = js.native
4190+
var onabort: js.Function1[ProgressEvent, _] = js.native
41914191

41924192
/**
41934193
* Can be set to change the response type. Value Data type of response property ""
@@ -4223,8 +4223,8 @@ class XMLHttpRequest extends EventTarget {
42234223
* MDN
42244224
*/
42254225
var upload: XMLHttpRequestEventTarget = js.native
4226-
var onerror: js.Function1[ErrorEvent, _] = js.native
4227-
var onloadstart: js.Function1[js.Any, _] = js.native
4226+
var onerror: js.Function1[ProgressEvent, _] = js.native
4227+
var onloadstart: js.Function1[ProgressEvent, _] = js.native
42284228
}
42294229

42304230
@js.native
@@ -7325,15 +7325,15 @@ trait XMLHttpRequestEventTarget extends EventTarget {
73257325
*
73267326
* MDN
73277327
*/
7328-
var onerror: js.Function1[ErrorEvent, _] = js.native
7328+
var onerror: js.Function1[ProgressEvent, _] = js.native
73297329

73307330
/**
73317331
* The function to call when an HTTP request returns after successfully loading
73327332
* content.
73337333
*
73347334
* MDN
73357335
*/
7336-
var onload: js.Function1[js.Any, _] = js.native
7336+
var onload: js.Function1[ProgressEvent, _] = js.native
73377337

73387338
/**
73397339
* A function that is called if the event times out; this only happens if a timeout has
@@ -7342,21 +7342,21 @@ trait XMLHttpRequestEventTarget extends EventTarget {
73427342
*
73437343
* MDN
73447344
*/
7345-
var ontimeout: js.Function1[js.Any, _] = js.native
7345+
var ontimeout: js.Function1[ProgressEvent, _] = js.native
73467346

73477347
/**
73487348
* The function to call when a request is aborted.
73497349
*
73507350
* MDN
73517351
*/
7352-
var onabort: js.Function1[js.Any, _] = js.native
7352+
var onabort: js.Function1[ProgressEvent, _] = js.native
73537353

73547354
/**
73557355
* A function that gets called when the HTTP request first begins loading data.
73567356
*
73577357
* MDN
73587358
*/
7359-
var onloadstart: js.Function1[js.Any, _] = js.native
7359+
var onloadstart: js.Function1[ProgressEvent, _] = js.native
73607360

73617361
/**
73627362
* A function that is called when the load is completed, even if the request failed.

0 commit comments

Comments
 (0)