Merge pull request #7649 from Novaleaf/bluebird

Bluebird
This commit is contained in:
Horiuchi_H
2016-01-20 16:52:29 +09:00
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -754,8 +754,8 @@ Promise.longStackTraces();
//TODO enable delay
fooProm = Promise.delay(fooThen, num);
fooProm = Promise.delay(foo, num);
fooProm = Promise.delay(num, fooThen);
fooProm = Promise.delay(num, foo);
voidProm = Promise.delay(num);
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+2 -2
View File
@@ -106,8 +106,8 @@ interface PromiseConstructor {
* Returns a promise that will be fulfilled with `value` (or `undefined`) after given `ms` milliseconds. If `value` is a promise, the delay will start counting down when it is fulfilled and the returned promise will be fulfilled with the fulfillment value of the `value` promise.
*/
// TODO enable more overloads
delay<T>(value: PromiseLike<T>, ms: number): Promise<T>;
delay<T>(value: T, ms: number): Promise<T>;
delay<T>(ms: number, value: PromiseLike<T>): Promise<T>;
delay<T>(ms: number, value: T): Promise<T>;
delay(ms: number): Promise<void>;
/**