Skip to content

Commit 17d60d5

Browse files
committed
Merged master into es2017-target
2 parents 7352e97 + a1cbfca commit 17d60d5

File tree

108 files changed

+71710
-58242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+71710
-58242
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ scripts/debug.bat
4242
scripts/run.bat
4343
scripts/word2md.js
4444
scripts/ior.js
45+
scripts/buildProtocol.js
4546
scripts/*.js.map
4647
scripts/typings/
4748
coverage/

issue_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- QUESTIONS: This is not a general support forum! Ask Qs at http://stackoverflow.com/questions/tagged/typescript -->
33
<!-- SUGGESTIONS: See https://github.com/Microsoft/TypeScript-wiki/blob/master/Writing-Good-Design-Proposals.md -->
44

5-
**TypeScript Version:** 1.8.0 / nightly (2.0.0-dev.201xxxxx)
5+
**TypeScript Version:** 2.0.3 / nightly (2.1.0-dev.201xxxxx)
66

77
**Code**
88

lib/lib.d.ts

Lines changed: 217 additions & 189 deletions
Large diffs are not rendered by default.

lib/lib.dom.d.ts

Lines changed: 191 additions & 190 deletions
Large diffs are not rendered by default.

lib/lib.es2015.core.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ interface NumberConstructor {
217217

218218
/**
219219
* Returns true if passed value is finite.
220-
* Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a
220+
* Unlike the global isFinite, Number.isFinite doesn't forcibly convert the parameter to a
221221
* number. Only finite values of the type number, result in true.
222222
* @param number A numeric value.
223223
*/

lib/lib.es5.d.ts

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,9 @@ interface Function {
260260
*/
261261
bind(this: Function, thisArg: any, ...argArray: any[]): any;
262262

263+
/** Returns a string representation of a function. */
264+
toString(): string;
265+
263266
prototype: any;
264267
readonly length: number;
265268

@@ -1216,6 +1219,30 @@ interface Array<T> {
12161219
* @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
12171220
*/
12181221
forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
1222+
/**
1223+
* Calls a defined callback function on each element of an array, and returns an array that contains the results.
1224+
* @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array.
1225+
* @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
1226+
*/
1227+
map<U>(this: [T, T, T, T, T], callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): [U, U, U, U, U];
1228+
/**
1229+
* Calls a defined callback function on each element of an array, and returns an array that contains the results.
1230+
* @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array.
1231+
* @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
1232+
*/
1233+
map<U>(this: [T, T, T, T], callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): [U, U, U, U];
1234+
/**
1235+
* Calls a defined callback function on each element of an array, and returns an array that contains the results.
1236+
* @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array.
1237+
* @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
1238+
*/
1239+
map<U>(this: [T, T, T], callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): [U, U, U];
1240+
/**
1241+
* Calls a defined callback function on each element of an array, and returns an array that contains the results.
1242+
* @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array.
1243+
* @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value.
1244+
*/
1245+
map<U>(this: [T, T], callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): [U, U];
12191246
/**
12201247
* Calls a defined callback function on each element of an array, and returns an array that contains the results.
12211248
* @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array.

lib/lib.es6.d.ts

Lines changed: 218 additions & 190 deletions
Large diffs are not rendered by default.

lib/lib.webworker.d.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ declare var Worker: {
744744
}
745745

746746
interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
747-
onreadystatechange: (this: this, ev: ProgressEvent) => any;
747+
onreadystatechange: (this: this, ev: Event) => any;
748748
readonly readyState: number;
749749
readonly response: any;
750750
readonly responseText: string;
@@ -770,13 +770,13 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
770770
readonly LOADING: number;
771771
readonly OPENED: number;
772772
readonly UNSENT: number;
773-
addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
774-
addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
775-
addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
773+
addEventListener(type: "abort", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
774+
addEventListener(type: "error", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
775+
addEventListener(type: "load", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
776776
addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
777-
addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
777+
addEventListener(type: "loadstart", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
778778
addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
779-
addEventListener(type: "readystatechange", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
779+
addEventListener(type: "readystatechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
780780
addEventListener(type: "timeout", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
781781
addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
782782
}

0 commit comments

Comments
 (0)