chore(typings): update type definition for concatAll

closes ReactiveX#1436
staltz · Apr 13, 2016 · 33ec0ad · 33ec0ad
1 parent eac28ca
commit 33ec0ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Observable.ts b/src/Observable.ts
@@ -1,4 +1,4 @@
-import {PartialObserver, Observer} from './Observer';
+import {PartialObserver} from './Observer';
 import {Operator} from './Operator';
 import {Subscriber} from './Subscriber';
 import {Subscription, AnonymousSubscription, TeardownLogic} from './Subscription';
@@ -10,7 +10,9 @@ import {IfObservable} from './observable/IfObservable';
 import {ErrorObservable} from './observable/ErrorObservable';
 
 export interface Subscribable<T> {
-  subscribe(observer: Observer<T>): AnonymousSubscription;
+  subscribe(observerOrNext?: PartialObserver<T> | ((value: T) => void),
+            error?: (error: any) => void,
+            complete?: () => void): AnonymousSubscription;
 }
 
 export type SubscribableOrPromise<T> = Subscribable<T> | Promise<T>;

diff --git a/src/operator/concatAll.ts b/src/operator/concatAll.ts
@@ -1,3 +1,4 @@
+import {Subscribable} from '../Observable';
 import {MergeAllOperator} from './mergeAll';
 
 /**
@@ -48,4 +49,5 @@ export function concatAll<T>(): T {
 
 export interface ConcatAllSignature<T> {
   (): T;
+  <R>(): Subscribable<R>;
 }