Merge pull request #7967 from jarnova/master

modified IDeferred resolve method to allow passing a promise of type …
This commit is contained in:
Masahiro Wakame
2016-02-07 01:44:34 +09:00

View File

@@ -1084,7 +1084,7 @@ declare module angular {
}
interface IDeferred<T> {
resolve(value?: T): void;
resolve(value?: T|IPromise<T>): void;
reject(reason?: any): void;
notify(state?: any): void;
promise: IPromise<T>;