Merge branch 'master' into release-2.2

This commit is contained in:
Mohamed Hegazy
2017-02-14 13:31:54 -08:00
13 changed files with 523 additions and 19 deletions

12
src/lib/es5.d.ts vendored
View File

@@ -137,16 +137,10 @@ interface ObjectConstructor {
getOwnPropertyNames(o: any): string[];
/**
* Creates an object that has null prototype.
* @param o Object to use as a prototype. May be null
* Creates an object that has the specified prototype or that has null prototype.
* @param o Object to use as a prototype. May be null.
*/
create(o: null): any;
/**
* Creates an object that has the specified prototype, and that optionally contains specified properties.
* @param o Object to use as a prototype. May be null
*/
create<T extends object>(o: T): T;
create<T extends object>(o: T | null): T | object;
/**
* Creates an object that has the specified prototype, and that optionally contains specified properties.