From 79d3febe6b5b8912f1630eb30ae91e55b6e34261 Mon Sep 17 00:00:00 2001 From: yaoyao Date: Tue, 12 Jan 2016 14:18:55 +0800 Subject: [PATCH 1/5] To fix #2583 --- baselines/dom.generated.d.ts | 14 ++++++++ baselines/webworker.generated.d.ts | 14 ++++++++ inputfiles/addedTypes.json | 55 ++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index fb4a7f097..20c4186e6 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -12633,6 +12633,20 @@ declare var HTMLTemplateElement: { new(): HTMLTemplateElement; } +interface URLConstructor { + hash: string; + search: string; + pathname: string; + port: string; + hostname: string; + host: string; + password: string; + username: string; + protocol: string; + origin: string; + href: string; +} + declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject; interface ErrorEventHandler { diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index 208419e67..3581b2aad 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -932,6 +932,20 @@ interface ProgressEventInit extends EventInit { total?: number; } +interface URLConstructor { + hash: string; + search: string; + pathname: string; + port: string; + hostname: string; + host: string; + password: string; + username: string; + protocol: string; + origin: string; + href: string; +} + declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject; interface ErrorEventHandler { diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index c49d24437..2aca04655 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -302,5 +302,60 @@ "interface": "HTMLSelectElement", "name": "selectedOptions", "type": "HTMLCollection" + }, + { + "kind": "interface", + "name": "URLConstructor", + "properties": [ + { + "name": "hash", + "type": "string" + }, + { + "name": "search", + "type": "string" + }, + { + "name": "pathname", + "type": "string" + }, + { + "name": "port", + "type": "string" + }, + { + "name": "hostname", + "type": "string" + }, + { + "name": "host", + "type": "string" + }, + { + "name": "password", + "type": "string" + }, + { + "name": "username", + "type": "string" + }, + { + "name": "protocol", + "type": "string" + }, + { + "name": "origin", + "type": "string" + }, + { + "name": "href", + "type": "string" + } + ] + }, + { + "kind": "constructor", + "interface": "URL", + "signatures":["new (url: string, base?: string): URLConstructor"] } ] From 859643d65f697932119fcc7b1645fe36542899eb Mon Sep 17 00:00:00 2001 From: yaoyao Date: Tue, 26 Jan 2016 10:37:51 +0800 Subject: [PATCH 2/5] try to change properties of URL --- baselines/dom.generated.d.ts | 16 ----- baselines/webworker.generated.d.ts | 14 ---- inputfiles/addedTypes.json | 111 ++++++++++++++++------------- inputfiles/removedTypes.json | 10 +++ 4 files changed, 71 insertions(+), 80 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 20c4186e6..f20b63672 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -10747,8 +10747,6 @@ declare var UIEvent: { } interface URL { - createObjectURL(object: any, options?: ObjectURLOptions): string; - revokeObjectURL(url: string): void; } declare var URL: URL; @@ -12633,20 +12631,6 @@ declare var HTMLTemplateElement: { new(): HTMLTemplateElement; } -interface URLConstructor { - hash: string; - search: string; - pathname: string; - port: string; - hostname: string; - host: string; - password: string; - username: string; - protocol: string; - origin: string; - href: string; -} - declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject; interface ErrorEventHandler { diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index 3581b2aad..208419e67 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -932,20 +932,6 @@ interface ProgressEventInit extends EventInit { total?: number; } -interface URLConstructor { - hash: string; - search: string; - pathname: string; - port: string; - hostname: string; - host: string; - password: string; - username: string; - protocol: string; - origin: string; - href: string; -} - declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject; interface ErrorEventHandler { diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 2aca04655..5e4bbe3c2 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -304,58 +304,69 @@ "type": "HTMLCollection" }, { - "kind": "interface", - "name": "URLConstructor", - "properties": [ - { - "name": "hash", - "type": "string" - }, - { - "name": "search", - "type": "string" - }, - { - "name": "pathname", - "type": "string" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "hostname", - "type": "string" - }, - { - "name": "host", - "type": "string" - }, - { - "name": "password", - "type": "string" - }, - { - "name": "username", - "type": "string" - }, - { - "name": "protocol", - "type": "string" - }, - { - "name": "origin", - "type": "string" - }, - { - "name": "href", - "type": "string" - } - ] + "kind": "property", + "interface": "URL", + "name": "hash", + "type": "number" }, { - "kind": "constructor", + "kind": "property", + "interface": "URL", + "name": "search", + "type": "number" + }, + { + "kind": "property", + "interface": "URL", + "name": "pathname", + "type": "number" + }, + { + "kind": "property", + "interface": "URL", + "name": "port", + "type": "number" + }, + { + "kind": "property", + "interface": "URL", + "name": "hostname", + "type": "number" + }, + { + "kind": "property", + "interface": "URL", + "name": "host", + "type": "number" + }, + { + "kind": "property", + "interface": "URL", + "name": "password", + "type": "number" + }, + { + "kind": "property", + "interface": "URL", + "name": "username", + "type": "number" + }, + { + "kind": "property", + "interface": "URL", + "name": "protocol", + "type": "number" + }, + { + "kind": "property", + "interface": "URL", + "name": "origin", + "type": "number" + }, + { + "kind": "property", "interface": "URL", - "signatures":["new (url: string, base?: string): URLConstructor"] + "name": "href", + "type": "number" } ] diff --git a/inputfiles/removedTypes.json b/inputfiles/removedTypes.json index 2618224c8..fa2989611 100644 --- a/inputfiles/removedTypes.json +++ b/inputfiles/removedTypes.json @@ -18,5 +18,15 @@ "kind": "method", "interface": "HTMLElement", "name": "contains" + }, + { + "kind": "method", + "interface": "URL", + "name": "createObjectURL" + }, + { + "kind": "method", + "interface": "URL", + "name": "revokeObjectURL" } ] From 99de366ef5f42c84ee08646fbfd588359d08a906 Mon Sep 17 00:00:00 2001 From: yaoyao Date: Tue, 26 Jan 2016 10:50:25 +0800 Subject: [PATCH 3/5] accept baseline after merging --- baselines/dom.generated.d.ts | 20 +++++++++++++++++--- inputfiles/removedTypes.json | 3 +++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index bcc97065d..6b280124a 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -1514,9 +1514,9 @@ interface DataTransferItemList { length: number; add(data: File): DataTransferItem; clear(): void; - item(index: number): File; + item(index: number): DataTransferItem; remove(index: number): void; - [index: number]: File; + [index: number]: DataTransferItem; } declare var DataTransferItemList: { @@ -3773,6 +3773,7 @@ interface HTMLCanvasElement extends HTMLElement { * @param type The standard MIME type for the image format to return. If you do not specify this parameter, the default value is a PNG format image. */ toDataURL(type?: string, ...args: any[]): string; + toBlob(): Blob; } declare var HTMLCanvasElement: { @@ -10753,8 +10754,21 @@ declare var UIEvent: { } interface URL { + hash: number; + search: number; + pathname: number; + port: number; + hostname: number; + host: number; + password: number; + username: number; + protocol: number; + origin: number; + href: number; +} + +declare var URL: { } -declare var URL: URL; interface UnviewableContentIdentifiedEvent extends NavigationEventWithReferrer { mediaType: string; diff --git a/inputfiles/removedTypes.json b/inputfiles/removedTypes.json index ea3d4fa60..cfc2409b9 100644 --- a/inputfiles/removedTypes.json +++ b/inputfiles/removedTypes.json @@ -28,6 +28,9 @@ "kind": "method", "interface": "URL", "name": "revokeObjectURL" + }, + { + "kind": "method", "interface": "StorageEvent", "name": "initStorageEvent" }, From c4094af1a212ec44f50b770341e987309044ef51 Mon Sep 17 00:00:00 2001 From: yaoyao Date: Tue, 26 Jan 2016 17:34:18 +0800 Subject: [PATCH 4/5] add inteface URLConstructor --- baselines/dom.generated.d.ts | 10 ++++++++++ baselines/webworker.generated.d.ts | 10 ++++++++++ inputfiles/addedTypes.json | 17 +++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 6b280124a..518de292d 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -12667,6 +12667,16 @@ declare var HTMLPictureElement: { new(): HTMLPictureElement; } +interface URLConstructor { + revokeObjectURL(url: string): void; + createObjectURL(object: any, options?: ObjectURLOptions): string; +} + +declare var URLConstructor: { + prototype: URLConstructor; + new(url: string, base?: string): URL; +} + declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject; interface ErrorEventHandler { diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index 35dc82333..fc3533431 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -933,6 +933,16 @@ interface ProgressEventInit extends EventInit { total?: number; } +interface URLConstructor { + revokeObjectURL(url: string): void; + createObjectURL(object: any, options?: ObjectURLOptions): string; +} + +declare var URLConstructor: { + prototype: URLConstructor; + new(url: string, base?: string): URL; +} + declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject; interface ErrorEventHandler { diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index ede00ce81..413daa99b 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -460,5 +460,22 @@ "interface": "Element", "name": "getElementsByTagName", "signatures": ["getElementsByTagName(tagname: \"picture\"): NodeListOf"] + }, + { + "kind": "interface", + "name": "URLConstructor", + "constructorSignatures": [ + "new(url: string, base?: string): URL" + ], + "methods": [ + { + "name": "revokeObjectURL", + "signatures": ["revokeObjectURL(url: string): void"] + }, + { + "name": "createObjectURL", + "signatures": ["createObjectURL(object: any, options?: ObjectURLOptions): string"] + } + ] } ] From 86617952d49ec65c99e50c0f0b4ee071a3d8ed2f Mon Sep 17 00:00:00 2001 From: yaoyao Date: Tue, 26 Jan 2016 18:06:20 +0800 Subject: [PATCH 5/5] try another way --- baselines/dom.generated.d.ts | 14 ++++---------- baselines/webworker.generated.d.ts | 10 ---------- inputfiles/addedTypes.json | 18 ++++-------------- inputfiles/removedTypes.json | 10 ---------- 4 files changed, 8 insertions(+), 44 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 518de292d..8eadb4b95 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -10768,6 +10768,10 @@ interface URL { } declare var URL: { + createObjectURL(object: any, options?: ObjectURLOptions): string; + revokeObjectURL(url: string): void; + prototype: URL; + new (url: string, base?: string): URL; } interface UnviewableContentIdentifiedEvent extends NavigationEventWithReferrer { @@ -12667,16 +12671,6 @@ declare var HTMLPictureElement: { new(): HTMLPictureElement; } -interface URLConstructor { - revokeObjectURL(url: string): void; - createObjectURL(object: any, options?: ObjectURLOptions): string; -} - -declare var URLConstructor: { - prototype: URLConstructor; - new(url: string, base?: string): URL; -} - declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject; interface ErrorEventHandler { diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index fc3533431..35dc82333 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -933,16 +933,6 @@ interface ProgressEventInit extends EventInit { total?: number; } -interface URLConstructor { - revokeObjectURL(url: string): void; - createObjectURL(object: any, options?: ObjectURLOptions): string; -} - -declare var URLConstructor: { - prototype: URLConstructor; - new(url: string, base?: string): URL; -} - declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject; interface ErrorEventHandler { diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 413daa99b..37f9b0ae7 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -462,20 +462,10 @@ "signatures": ["getElementsByTagName(tagname: \"picture\"): NodeListOf"] }, { - "kind": "interface", - "name": "URLConstructor", - "constructorSignatures": [ - "new(url: string, base?: string): URL" - ], - "methods": [ - { - "name": "revokeObjectURL", - "signatures": ["revokeObjectURL(url: string): void"] - }, - { - "name": "createObjectURL", - "signatures": ["createObjectURL(object: any, options?: ObjectURLOptions): string"] - } + "kind": "constructor", + "interface": "URL", + "signatures": [ + "new (url: string, base?: string): URL" ] } ] diff --git a/inputfiles/removedTypes.json b/inputfiles/removedTypes.json index cfc2409b9..77cd4f4e7 100644 --- a/inputfiles/removedTypes.json +++ b/inputfiles/removedTypes.json @@ -19,16 +19,6 @@ "interface": "HTMLElement", "name": "contains" }, - { - "kind": "method", - "interface": "URL", - "name": "createObjectURL" - }, - { - "kind": "method", - "interface": "URL", - "name": "revokeObjectURL" - }, { "kind": "method", "interface": "StorageEvent",