Skip to content

Fix few issues with EventListener and EventListenerOrEventObject #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 16, 2018
Merged

Fix few issues with EventListener and EventListenerOrEventObject #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d341203
Fix https://github.com/Microsoft/TypeScript/issues/21948: Use parens …
mhegazy Feb 15, 2018
2ac3d64
Fix https://github.com/Microsoft/TypeScript/issues/21922: Add type al…
mhegazy Feb 15, 2018
2740dc0
Update baselines
mhegazy Feb 15, 2018
ae7b826
Revert "remove EventListenerObject"
mhegazy Feb 15, 2018
bf27ba2
Add special handeling to EventListener
mhegazy Feb 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions TS.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,7 @@ module Emit =
| "DOMString" -> "string"
| "DOMTimeStamp" -> "number"
| "EndOfStreamError" -> "number"
| "EventListener" -> "EventListenerOrEventListenerObject"
| "double" | "float" -> "number"
| "object" -> "any"
| "ReadyState" -> "string"
Expand Down Expand Up @@ -870,11 +871,16 @@ module Emit =
let EmitCallBackInterface flavor (i:Browser.Interface) =
if ShouldKeep flavor i then
if getRemovedItemsByInterfaceName ItemKind.Interface flavor i.Name |> Array.isEmpty then
let m = i.Methods.Value.Methods.[0]
let overload = (GetOverloads (Function.Method m) false).[0]
let paramsString = ParamsToString overload.ParamCombinations
let returnType = DomTypeToTsType m.Type
Pt.Printl "type %s = (%s) => %s | { %s(%s): %s; };" i.Name paramsString returnType m.Name.Value paramsString returnType
if i.Name = "EventListener" then
Pt.Printl "interface %s {" i.Name
Pt.PrintWithAddedIndent "(evt: Event): void;"
Pt.Printl "}"
else
let m = i.Methods.Value.Methods.[0]
let overload = (GetOverloads (Function.Method m) false).[0]
let paramsString = ParamsToString overload.ParamCombinations
let returnType = DomTypeToTsType m.Type
Pt.Printl "type %s = ((%s) => %s) | { %s(%s): %s; };" i.Name paramsString returnType m.Name.Value paramsString returnType
Pt.Printl ""

let EmitCallBackFunctions flavor =
Expand Down Expand Up @@ -1097,7 +1103,7 @@ module Emit =

let emitStringEventHandler (addOrRemove: string) =
Pt.Printl
"%s%sEventListener(type: string, listener: EventListener, options?: boolean | %s): void;"
"%s%sEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | %s): void;"
fPrefix addOrRemove (getOptionsType addOrRemove)

let tryEmitTypedEventHandlerForInterface (addOrRemove: string) =
Expand Down Expand Up @@ -1523,6 +1529,9 @@ module Emit =
// Add missed interface definition from the spec
InputJson.getAddedItems InputJson.Interface flavor |> Array.iter EmitAddedInterface

Pt.Printl "declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;"
Pt.Printl ""

EmitCallBackFunctions flavor

if flavor <> Worker then
Expand Down
Loading