From fd7bdc3e18cabe9ad336619462f02ccd8e44b080 Mon Sep 17 00:00:00 2001 From: Akuukis Date: Wed, 3 Jul 2019 18:46:24 +0300 Subject: [PATCH] fix(eventsource): add EventListener to monkeypatch (#36614) --- types/eventsource/dom-monkeypatch.d.ts | 5 +++++ types/eventsource/test/eventsource-dom.test.ts | 8 ++++---- types/eventsource/test/eventsource-nodejs.test.ts | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/types/eventsource/dom-monkeypatch.d.ts b/types/eventsource/dom-monkeypatch.d.ts index 449dfd186a..63a0632125 100644 --- a/types/eventsource/dom-monkeypatch.d.ts +++ b/types/eventsource/dom-monkeypatch.d.ts @@ -1,3 +1,8 @@ +interface EventListener { + // tslint:disable-next-line: callable-types + (evt: Event): void; +} + /** * The Event interface represents any event which takes place in the DOM; some are user-generated (such as mouse or keyboard events), while others are generated by APIs (such as * events that indicate an animation has finished running, a video has been paused, and so forth). While events are usually triggered by such "external" sources, they can also be diff --git a/types/eventsource/test/eventsource-dom.test.ts b/types/eventsource/test/eventsource-dom.test.ts index 6221cafd9a..13f8b3cb4e 100644 --- a/types/eventsource/test/eventsource-dom.test.ts +++ b/types/eventsource/test/eventsource-dom.test.ts @@ -15,9 +15,9 @@ let withCredentials: boolean = eventSource.withCredentials; eventSource.onmessage = (event: MessageEvent) => {}; eventSource.onerror = (event: MessageEvent) => {}; eventSource.onopen = (event: MessageEvent) => {}; -eventSource.addEventListener = (type: string, listener: (e: Event) => void) => {}; +eventSource.addEventListener = (type: string, listener: EventListener) => {}; eventSource.dispatchEvent = (event: Event) => true; -eventSource.removeEventListener = (type: string, listener: (e: Event) => void) => {}; +eventSource.removeEventListener = (type: string, listener: EventListener) => {}; eventSource.close(); import EventSourcePolyfill = require("eventsource/lib/eventsource-polyfill"); @@ -35,7 +35,7 @@ withCredentials = eventSource.withCredentials; eventSourcePolyfill.onmessage = (event: MessageEvent) => {}; eventSourcePolyfill.onerror = (event: MessageEvent) => {}; eventSourcePolyfill.onopen = (event: MessageEvent) => {}; -eventSourcePolyfill.addEventListener = (type: string, listener: (e: Event) => void) => {}; +eventSourcePolyfill.addEventListener = (type: string, listener: EventListener) => {}; eventSourcePolyfill.dispatchEvent = (event: Event) => true; -eventSourcePolyfill.removeEventListener = (type: string, listener: (e: Event) => void) => {}; +eventSourcePolyfill.removeEventListener = (type: string, listener: EventListener) => {}; eventSourcePolyfill.close(); diff --git a/types/eventsource/test/eventsource-nodejs.test.ts b/types/eventsource/test/eventsource-nodejs.test.ts index d06c79cdde..ed05fc6c39 100644 --- a/types/eventsource/test/eventsource-nodejs.test.ts +++ b/types/eventsource/test/eventsource-nodejs.test.ts @@ -13,9 +13,9 @@ let withCredentials: boolean = eventSource.withCredentials; eventSource.onmessage = (event: MessageEvent) => {}; eventSource.onerror = (event: MessageEvent) => {}; eventSource.onopen = (event: MessageEvent) => {}; -eventSource.addEventListener = (type: string, listener: (e: Event) => void) => {}; +eventSource.addEventListener = (type: string, listener: EventListener) => {}; eventSource.dispatchEvent = (event: Event) => true; -eventSource.removeEventListener = (type: string, listener: (e: Event) => void) => {}; +eventSource.removeEventListener = (type: string, listener: EventListener) => {}; eventSource.close(); import EventSourcePolyfill = require("eventsource/lib/eventsource-polyfill"); @@ -33,7 +33,7 @@ withCredentials = eventSource.withCredentials; eventSourcePolyfill.onmessage = (event: MessageEvent) => {}; eventSourcePolyfill.onerror = (event: MessageEvent) => {}; eventSourcePolyfill.onopen = (event: MessageEvent) => {}; -eventSourcePolyfill.addEventListener = (type: string, listener: (e: Event) => void) => {}; +eventSourcePolyfill.addEventListener = (type: string, listener: EventListener) => {}; eventSourcePolyfill.dispatchEvent = (event: Event) => true; -eventSourcePolyfill.removeEventListener = (type: string, listener: (e: Event) => void) => {}; +eventSourcePolyfill.removeEventListener = (type: string, listener: EventListener) => {}; eventSourcePolyfill.close();