Merge pull request #1823 from Igorbek/master

Definitions of spec of Promises/A+; Updated RxJS
This commit is contained in:
Igorbek
2014-03-10 11:24:41 -07:00
4 changed files with 101 additions and 5 deletions
+3 -3
View File
@@ -104,9 +104,9 @@ declare module Rx {
* Promise A+
*/
export interface IPromise<T> {
then<R>(onFulfilled?: (value: T) => IPromise<R>, onRejected?: (reason: any) => IPromise<R>): IPromise<R>;
then<R>(onFulfilled?: (value: T) => IPromise<R>, onRejected?: (reason: any) => R): IPromise<R>;
then<R>(onFulfilled?: (value: T) => R, onRejected?: (reason: any) => IPromise<R>): IPromise<R>;
then<R>(onFulfilled: (value: T) => IPromise<R>, onRejected: (reason: any) => IPromise<R>): IPromise<R>;
then<R>(onFulfilled: (value: T) => IPromise<R>, onRejected?: (reason: any) => R): IPromise<R>;
then<R>(onFulfilled: (value: T) => R, onRejected: (reason: any) => IPromise<R>): IPromise<R>;
then<R>(onFulfilled?: (value: T) => R, onRejected?: (reason: any) => R): IPromise<R>;
}
}
+1 -2
View File
@@ -1,4 +1,4 @@
// Type definitions for RxJS
// Type definitions for RxJS v2.2.13
// Project: http://rx.codeplex.com/
// Definitions by: gsino <http://www.codeplex.com/site/users/view/gsino>
// Definitions by: Igor Oleinikov <https://github.com/Igorbek>
@@ -167,7 +167,6 @@ declare module Rx {
// Current Thread IScheduler
interface ICurrentThreadScheduler extends IScheduler {
scheduleRequired(): boolean;
ensureTrampoline(action: () =>IDisposable): IDisposable;
}
// Notifications