Skip to content

Commit

Permalink
fix(combineLatest): fix type signature
Browse files Browse the repository at this point in the history
  • Loading branch information
luisgabriel authored and benlesh committed Oct 12, 2015
1 parent 893cb7e commit a3e6deb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Observable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export default class Observable<T> implements CoreOperators<T> {
}

// static method stubs
static combineLatest: <T>(...observables: (Observable<any> | ((...values: Array<any>) => T)) []) => Observable<T>;
static combineLatest: <T>(...observables: (Observable<any> | ((...values: Array<any>) => T) | Scheduler)[]) => Observable<T>;
static concat: (...observables: any[]) => Observable<any>;
static defer: <T>(observableFactory: () => Observable<T>) => Observable<T>;
static empty: <T>(scheduler?: Scheduler) => Observable<T>;
Expand Down
4 changes: 2 additions & 2 deletions src/operators/combineLatest-static.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ArrayObservable from '../observables/ArrayObservable';
import { CombineLatestOperator } from './combineLatest-support';
import Scheduler from '../Scheduler';

export default function combineLatest<T, R>(...observables: (Observable<any> | ((...values: Array<any>) => R) | Scheduler)[]): Observable<R> {
export default function combineLatest<R>(...observables: (Observable<any> | ((...values: Array<any>) => R) | Scheduler)[]): Observable<R> {
let project, scheduler;

if (typeof (<any>observables[observables.length - 1]).schedule === 'function') {
Expand All @@ -15,4 +15,4 @@ export default function combineLatest<T, R>(...observables: (Observable<any> | (
}

return new ArrayObservable(observables, scheduler).lift(new CombineLatestOperator(project));
}
}

0 comments on commit a3e6deb

Please sign in to comment.