Skip to content

Commit

Permalink
Merge pull request DefinitelyTyped#7649 from Novaleaf/bluebird
Browse files Browse the repository at this point in the history
Bluebird
  • Loading branch information
horiuchi committed Jan 20, 2016
2 parents 482e57d + 82a2b62 commit d1d33de
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions bluebird/bluebird-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down
4 changes: 2 additions & 2 deletions bluebird/bluebird.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;

/**
Expand Down

0 comments on commit d1d33de

Please sign in to comment.