Skip to content

Commit

Permalink
Make bluebird compatible with new promiselike definition
Browse files Browse the repository at this point in the history
  • Loading branch information
RyanCavanaugh committed Jul 15, 2016
1 parent 9d7d5a2 commit 7fe95f2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion bluebird/bluebird-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,6 @@ fooProm = Promise.race(fooArr);

//TODO expand tests to overloads
fooArrProm = Promise.some(fooThenArrThen, num);
fooArrProm = Promise.some(fooArrThen, num);
fooArrProm = Promise.some(fooThenArr, num);
fooArrProm = Promise.some(fooArr, num);

Expand Down
2 changes: 1 addition & 1 deletion bluebird/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ interface Promise<T> extends PromiseLike<T>, Promise.Inspection<T> {
/**
* Promises/A+ `.then()` with progress handler. Returns a new promise chained from this promise. The new promise will be rejected or resolved dedefer on the passed `fulfilledHandler`, `rejectedHandler` and the state of this promise.
*/
then<U>(onFulfill: (value: T) => U | PromiseLike<U>, onReject?: (error: any) => U | PromiseLike<U>, onProgress?: (note: any) => any): Promise<U>;
then<U>(onFulfill?: (value: T) => U | PromiseLike<U>, onReject?: (error: any) => U | PromiseLike<U>, onProgress?: (note: any) => any): Promise<U>;
then<U>(onFulfill: (value: T) => U | PromiseLike<U>, onReject?: (error: any) => void | PromiseLike<void>, onProgress?: (note: any) => any): Promise<U>;

/**
Expand Down

0 comments on commit 7fe95f2

Please sign in to comment.