From 438c3da3901bb70bd4bf169d1ccda25b00c230a2 Mon Sep 17 00:00:00 2001 From: SnakeDrak Date: Mon, 14 Jan 2019 15:58:08 +0100 Subject: [PATCH 1/5] Added tests --- types/eventsource/eventsource-tests.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/types/eventsource/eventsource-tests.ts b/types/eventsource/eventsource-tests.ts index c1b53030cd..d06c79cdde 100644 --- a/types/eventsource/eventsource-tests.ts +++ b/types/eventsource/eventsource-tests.ts @@ -10,9 +10,9 @@ let openState: number = eventSource.OPEN; openState = EventSource.OPEN; let url: string = eventSource.url; let withCredentials: boolean = eventSource.withCredentials; -eventSource.onmessage = (event: Event) => {}; -eventSource.onerror = (event: Event) => {}; -eventSource.onopen = (event: Event) => {}; +eventSource.onmessage = (event: MessageEvent) => {}; +eventSource.onerror = (event: MessageEvent) => {}; +eventSource.onopen = (event: MessageEvent) => {}; eventSource.addEventListener = (type: string, listener: (e: Event) => void) => {}; eventSource.dispatchEvent = (event: Event) => true; eventSource.removeEventListener = (type: string, listener: (e: Event) => void) => {}; @@ -30,9 +30,9 @@ openState = eventSource.OPEN; openState = EventSource.OPEN; url = eventSourcePolyfill.url; withCredentials = eventSource.withCredentials; -eventSourcePolyfill.onmessage = (event: Event) => {}; -eventSourcePolyfill.onerror = (event: Event) => {}; -eventSourcePolyfill.onopen = (event: Event) => {}; +eventSourcePolyfill.onmessage = (event: MessageEvent) => {}; +eventSourcePolyfill.onerror = (event: MessageEvent) => {}; +eventSourcePolyfill.onopen = (event: MessageEvent) => {}; eventSourcePolyfill.addEventListener = (type: string, listener: (e: Event) => void) => {}; eventSourcePolyfill.dispatchEvent = (event: Event) => true; eventSourcePolyfill.removeEventListener = (type: string, listener: (e: Event) => void) => {}; From 10921906e27588652b9f938af7126db264242d68 Mon Sep 17 00:00:00 2001 From: SnakeDrak Date: Mon, 14 Jan 2019 16:00:40 +0100 Subject: [PATCH 2/5] Added to eventsource --- types/eventsource/lib/eventsource-polyfill/index.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/types/eventsource/lib/eventsource-polyfill/index.d.ts b/types/eventsource/lib/eventsource-polyfill/index.d.ts index 86b82105cc..74e3e22faa 100644 --- a/types/eventsource/lib/eventsource-polyfill/index.d.ts +++ b/types/eventsource/lib/eventsource-polyfill/index.d.ts @@ -11,9 +11,9 @@ declare class EventSource { readonly url: string; readonly readyState: number; readonly withCredentials: boolean; - onopen: EventListener; - onmessage: EventListener; - onerror: EventListener; + onopen: (evt: MessageEvent) => any; + onmessage: (evt: MessageEvent) => any; + onerror: (evt: MessageEvent) => any; addEventListener(type: string, listener: EventListener): void; dispatchEvent(evt: Event): boolean; removeEventListener(type: string, listener?: EventListener): void; From d77452c5562010f20f0122e73d6ca35bcaac1bc7 Mon Sep 17 00:00:00 2001 From: SnakeDrak Date: Mon, 14 Jan 2019 16:11:14 +0100 Subject: [PATCH 3/5] Added header to notify --- types/eventsource/index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/types/eventsource/index.d.ts b/types/eventsource/index.d.ts index 1308515917..11438d3e92 100644 --- a/types/eventsource/index.d.ts +++ b/types/eventsource/index.d.ts @@ -2,6 +2,7 @@ // Project: http://github.com/EventSource/eventsource // Definitions by: Scott Lee Davis // Ali Afroozeh +// Pedro Gámez // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.8 From 9455b713a1aef14ba2a90ca3600bbb0bba3879ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20G=C3=A1mez?= Date: Mon, 14 Jan 2019 16:16:51 +0100 Subject: [PATCH 4/5] Fixed eventsource --- types/eventsource/index.d.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/types/eventsource/index.d.ts b/types/eventsource/index.d.ts index 11438d3e92..0d38a086fb 100644 --- a/types/eventsource/index.d.ts +++ b/types/eventsource/index.d.ts @@ -19,9 +19,9 @@ declare class EventSource { readonly url: string; readonly readyState: number; readonly withCredentials: boolean; - onopen: EventListener; - onmessage: EventListener; - onerror: EventListener; + onopen: (evt: MessageEvent) => any; + onmessage: (evt: MessageEvent) => any; + onerror: (evt: MessageEvent) => any; addEventListener(type: string, listener: EventListener): void; dispatchEvent(evt: Event): boolean; removeEventListener(type: string, listener?: EventListener): void; @@ -29,7 +29,7 @@ declare class EventSource { } declare namespace EventSource { - enum ReadyState {CONNECTING = 0, OPEN = 1, CLOSED = 2} + enum ReadyState { CONNECTING = 0, OPEN = 1, CLOSED = 2 } interface EventSourceInitDict { withCredentials?: boolean; From 6d5059591db1c2115b9f797b668cca6bc4c4bbe8 Mon Sep 17 00:00:00 2001 From: SnakeDrak Date: Mon, 14 Jan 2019 16:55:27 +0100 Subject: [PATCH 5/5] Update version number --- types/eventsource/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/eventsource/index.d.ts b/types/eventsource/index.d.ts index 0d38a086fb..f0dcd7513f 100644 --- a/types/eventsource/index.d.ts +++ b/types/eventsource/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for eventsource 1.0 +// Type definitions for eventsource 1.1 // Project: http://github.com/EventSource/eventsource // Definitions by: Scott Lee Davis // Ali Afroozeh