Merge branch 'master' of https://github.com/Igorbek/rx.d.ts into RxJS

This commit is contained in:
Igor Oleinikov
2014-09-30 20:11:50 -07:00
2 changed files with 4 additions and 4 deletions

View File

@@ -49,8 +49,8 @@ declare module Rx {
interface ObservableStatic {
interval(period: number, scheduler?: IScheduler): Observable<number>;
interval(dutTime: number, period: number, scheduler?: IScheduler): Observable<number>;
timer(dueTime: number, period: number, scheduler: IScheduler): Observable<number>;
timer(dueTime: number, scheduler: IScheduler): Observable<number>;
timer(dueTime: number, period: number, scheduler?: IScheduler): Observable<number>;
timer(dueTime: number, scheduler?: IScheduler): Observable<number>;
generateWithRelativeTime<TState, TResult>(
initialState: TState,
condition: (state: TState) => boolean,

4
rx/rx.time.d.ts vendored
View File

@@ -17,8 +17,8 @@ declare module Rx {
}
interface ObservableStatic {
timer(dueTime: Date, period: number, scheduler: IScheduler): Observable<number>;
timer(dueTime: Date, scheduler: IScheduler): Observable<number>;
timer(dueTime: Date, period: number, scheduler?: IScheduler): Observable<number>;
timer(dueTime: Date, scheduler?: IScheduler): Observable<number>;
generateWithAbsoluteTime<TState, TResult>(
initialState: TState,