From 3cd4647ff080d0477b8d3fa337f038dc810046cb Mon Sep 17 00:00:00 2001 From: Carl de Billy Date: Sat, 10 Aug 2013 17:34:48 -0400 Subject: [PATCH] Fixed Rx.Scheduler and Rx.Disposable Rx.Scheduler and Rx.Disposable were wrongly typed since TS 0.9.x --- rx.js/rx.js.d.ts | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/rx.js/rx.js.d.ts b/rx.js/rx.js.d.ts index 49ebff1e38..b94679602d 100644 --- a/rx.js/rx.js.d.ts +++ b/rx.js/rx.js.d.ts @@ -60,10 +60,13 @@ declare module Rx { dispose(): void; } - export interface Disposable { - (action: () =>void ): IDisposable; - create(action: () =>void ): _IDisposable; + export interface Disposable { + new (action: () =>void ): IDisposable; + } + + var Disposable: { + create(action: () => void): _IDisposable; empty: _IDisposable; } @@ -141,12 +144,13 @@ declare module Rx { scheduleRecursiveWithAbsolute(dueTime: number, action: (action: (dueTime: number) =>void ) =>void ): _IDisposable; scheduleRecursiveWithAbsoluteAndState(state: any, dueTime: number, action: (state: any, action: (state: any, dueTime: number) =>void ) =>void ): _IDisposable; } - export interface Scheduler { - (now: () =>number, - schedule: (state: any, action: (scheduler: IScheduler, state: any) =>_IDisposable) => _IDisposable, - scheduleRelative: (state: any, dueTime: number, action: (scheduler: IScheduler, state: any) =>_IDisposable) =>_IDisposable, - scheduleAbsolute: (state: any, dueTime: number, action: (scheduler: IScheduler, state: any) =>_IDisposable) =>_IDisposable - ): IScheduler; + + var Scheduler: { + //(now: () =>number, + // schedule: (state: any, action: (scheduler: IScheduler, state: any) =>_IDisposable) => _IDisposable, + // scheduleRelative: (state: any, dueTime: number, action: (scheduler: IScheduler, state: any) =>_IDisposable) =>_IDisposable, + // scheduleAbsolute: (state: any, dueTime: number, action: (scheduler: IScheduler, state: any) =>_IDisposable) =>_IDisposable + // ): IScheduler; now(): number; normalize(timeSpan: number): number;