Skip to content

Merge branch release-1.6 #4470

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
zhengbli merged 3 commits into from
Aug 26, 2015
Merged

Merge branch release-1.6 #4470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7ea94b
fix MessageEvent and ProgressEvent constructors
zhengbli Aug 25, 2015
748231f
CR feedback
zhengbli Aug 26, 2015
b340a47
Merge pull request #4469 from zhengbli/issue4295
zhengbli Aug 26, 2015
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
20 changes: 17 additions & 3 deletions src/lib/dom.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7706,7 +7706,7 @@ interface MessageEvent extends Event {

declare var MessageEvent: {
prototype: MessageEvent;
new(): MessageEvent;
new(type: string, eventInitDict?: MessageEventInit): MessageEvent;
}

interface MessagePort extends EventTarget {
Expand Down Expand Up @@ -8448,7 +8448,7 @@ interface ProgressEvent extends Event {

declare var ProgressEvent: {
prototype: ProgressEvent;
new(): ProgressEvent;
new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
}

interface Range {
Expand Down Expand Up @@ -12615,7 +12615,6 @@ interface NodeListOf<TNode extends Node> extends NodeList {
[index: number]: TNode;
}


interface BlobPropertyBag {
type?: string;
endings?: string;
Expand All @@ -12632,6 +12631,21 @@ interface EventListenerObject {

declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;

interface MessageEventInit extends EventInit {
data?: any;
origin?: string;
lastEventId?: string;
channel?: string;
source?: any;
ports?: MessagePort[];
}

interface ProgressEventInit extends EventInit {
lengthComputable?: boolean;
loaded?: number;
total?: number;
}

interface ErrorEventHandler {
(message: string, filename?: string, lineno?: number, colno?: number, error?:Error): void;
}
Expand Down
19 changes: 17 additions & 2 deletions src/lib/webworker.generated.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ interface MessageEvent extends Event {

declare var MessageEvent: {
prototype: MessageEvent;
new(): MessageEvent;
new(type: string, eventInitDict?: MessageEventInit): MessageEvent;
}

interface MessagePort extends EventTarget {
Expand Down Expand Up @@ -640,7 +640,7 @@ interface ProgressEvent extends Event {

declare var ProgressEvent: {
prototype: ProgressEvent;
new(): ProgressEvent;
new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
}

interface WebSocket extends EventTarget {
Expand Down Expand Up @@ -911,6 +911,21 @@ interface EventListenerObject {

declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;

interface MessageEventInit extends EventInit {
data?: any;
origin?: string;
lastEventId?: string;
channel?: string;
source?: any;
ports?: MessagePort[];
}

interface ProgressEventInit extends EventInit {
lengthComputable?: boolean;
loaded?: number;
total?: number;
}

interface ErrorEventHandler {
(message: string, filename?: string, lineno?: number, colno?: number, error?:Error): void;
}
Expand Down