diff --git a/rx.js/rx.js.async.d.ts b/rx.js/rx.js.async.d.ts
new file mode 100644
index 0000000000..98fb930f77
--- /dev/null
+++ b/rx.js/rx.js.async.d.ts
@@ -0,0 +1,22 @@
+///
+
+// Type definitions for RxJS-Async package 2.2
+// Project: http://rx.codeplex.com/
+// Definitions by: zoetrope
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+//
+// Dependencies:
+// -> rx.js
+// -> rx.async.js
+
+declare module Rx {
+ interface Observable {
+ start(func: () => T, scheduler?: IScheduler, context?: any): IObservable;
+ toAsync(func: Function, scheduler?: IScheduler, context?: any): (...arguments: any[]) => IObservable;
+ fromCallback(func: (...arguments: any[]) => void, scheduler?: IScheduler, context?: any, selector?: (...arguments: T[])=>T): () => IObservable;
+ fromNodeCallback(func: (...arguments: any[]) => void, scheduler?: IScheduler, context?: any, selector?: (...arguments: any[])=>T): (...arguments: any[]) => IObservable;
+ fromEvent(element: any, eventName: string, selector?: (...arguments: any[])=>T): IObservable;
+ fromEventPattern(addHandler: (handler: any)=> void, removeHandler: (handler: any)=> void, selector?: (...arguments: any[])=>T): IObservable;
+ fromPromise(promise: any): IObservable;
+ }
+}
\ No newline at end of file
diff --git a/rx.js/rx.js.async.d.ts.tscparams b/rx.js/rx.js.async.d.ts.tscparams
new file mode 100644
index 0000000000..3cc762b550
--- /dev/null
+++ b/rx.js/rx.js.async.d.ts.tscparams
@@ -0,0 +1 @@
+""
\ No newline at end of file
diff --git a/rx.js/rx.js.d.ts b/rx.js/rx.js.d.ts
index 7baa2fd318..aeefce98fd 100644
--- a/rx.js/rx.js.d.ts
+++ b/rx.js/rx.js.d.ts
@@ -166,31 +166,6 @@ declare module Rx {
ensureTrampoline(action: () =>_IDisposable): _IDisposable;
}
- // Virtual IScheduler
- interface IVirtualTimeScheduler extends IScheduler {
- toRelative(duetime): number;
- toDateTimeOffset(duetime: number): number;
-
- clock: number;
- comparer: (x: number, y: number) =>number;
- isEnabled: boolean;
- queue: IPriorityQueue;
- scheduleRelativeWithState(state: any, dueTime: number, action: (scheduler: IScheduler, state: any) =>_IDisposable): _IDisposable;
- scheduleRelative(dueTime: number, action: () =>void ): _IDisposable;
- start(): _IDisposable;
- stop(): void;
- advanceTo(time: number);
- advanceBy(time: number);
- sleep(time: number);
- getNext(): IScheduledItem;
- scheduleAbsolute(dueTime: number, action: () =>void );
- scheduleAbsoluteWithState(state: any, dueTime: number, action: (scheduler: IScheduler, state: any) =>_IDisposable): _IDisposable;
- }
- //export module VirtualTimeScheduler {
- // //absract
- // function new (initialClock: number, comparer: (x: number, y: number) =>number): IVirtualTimeScheduler;
- //}
-
// CatchScheduler
interface ICatchScheduler extends IScheduler { }
@@ -379,8 +354,6 @@ declare module Rx {
interface Observable {
(subscribe: (observer: IObserver) =>_IDisposable): IObservable;
- start(func: () =>T, scheduler?: IScheduler, context?: any): IObservable;
- toAsync(func: Function, scheduler?: IScheduler, context?: any): (...arguments: any[]) => IObservable;
create(subscribe: (observer: IObserver) => void ): IObservable;
//create(subscribe: (observer: IObserver) => () => void ): IObservable;
createWithDisposable(subscribe: (observer: IObserver) =>_IDisposable): IObservable;
diff --git a/rx.js/rx.js.virtualtime.d.ts b/rx.js/rx.js.virtualtime.d.ts
new file mode 100644
index 0000000000..24d40e6019
--- /dev/null
+++ b/rx.js/rx.js.virtualtime.d.ts
@@ -0,0 +1,37 @@
+///
+
+// Type definitions for RxJS-VirtualTime package 2.2
+// Project: http://rx.codeplex.com/
+// Definitions by: gsino
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+//
+// Dependencies:
+// -> rx.js
+// -> rx.virtualtime.js
+
+declare module Rx {
+ // Virtual IScheduler
+ interface IVirtualTimeScheduler extends IScheduler {
+ toRelative(duetime): number;
+ toDateTimeOffset(duetime: number): number;
+
+ clock: number;
+ comparer: (x: number, y: number) =>number;
+ isEnabled: boolean;
+ queue: IPriorityQueue;
+ scheduleRelativeWithState(state: any, dueTime: number, action: (scheduler: IScheduler, state: any) =>_IDisposable): _IDisposable;
+ scheduleRelative(dueTime: number, action: () =>void ): _IDisposable;
+ start(): _IDisposable;
+ stop(): void;
+ advanceTo(time: number);
+ advanceBy(time: number);
+ sleep(time: number);
+ getNext(): IScheduledItem;
+ scheduleAbsolute(dueTime: number, action: () =>void );
+ scheduleAbsoluteWithState(state: any, dueTime: number, action: (scheduler: IScheduler, state: any) =>_IDisposable): _IDisposable;
+ }
+ //export module VirtualTimeScheduler {
+ // //absract
+ // function new (initialClock: number, comparer: (x: number, y: number) =>number): IVirtualTimeScheduler;
+ //}
+}
\ No newline at end of file
diff --git a/rx.js/rx.js.virtualtime.d.ts.tscparams b/rx.js/rx.js.virtualtime.d.ts.tscparams
new file mode 100644
index 0000000000..3cc762b550
--- /dev/null
+++ b/rx.js/rx.js.virtualtime.d.ts.tscparams
@@ -0,0 +1 @@
+""
\ No newline at end of file