refactor(multiCast): update type definition for multiCast

ReactiveX · Dec 6, 2015 · 89bc31f · 89bc31f
1 parent 0bffca6
commit 89bc31f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/CoreOperators.ts b/src/CoreOperators.ts
@@ -51,7 +51,7 @@ export interface CoreOperators<T> {
  mergeMap?: <R>(project: ((x: T, ix: number) => Observable<any>),
  projectResult?: (x: T, y: any, ix: number, iy: number) => R, concurrent?: number) => Observable<R>;
  mergeMapTo?: <R>(observable: Observable<any>, projectResult?: (x: T, y: any, ix: number, iy: number) => R, concurrent?: number) => Observable<R>;
- multicast?: (subjectFactory: () => Subject<T>) => ConnectableObservable<T>;
+ multicast?: (subjectOrSubjectFactory: Subject<T>|(() => Subject<T>)) => ConnectableObservable<T>;
  observeOn?: (scheduler: Scheduler, delay?: number) => Observable<T>;
  partition?: (predicate: (x: T) => boolean) => Observable<T>[];
  publish?: () => ConnectableObservable<T>;

diff --git a/src/Observable.ts b/src/Observable.ts
@@ -4,7 +4,7 @@ import {Scheduler} from './Scheduler';
 import {Subscriber} from './Subscriber';
 import {Subscription} from './Subscription';
 import {root} from './util/root';
-import {CoreOperators } from './CoreOperators';
+import {CoreOperators} from './CoreOperators';
 import {SymbolShim} from './util/SymbolShim';
 import {GroupedObservable} from './operator/groupBy-support';
 import {ConnectableObservable} from './observable/ConnectableObservable';
@@ -211,7 +211,7 @@ export class Observable<T> implements CoreOperators<T> {
  projectResult?: (x: T, y: any, ix: number, iy: number) => R,
  concurrent?: number) => Observable<R>;
  mergeMapTo: <R>(observable: Observable<any>, projectResult?: (x: T, y: any, ix: number, iy: number) => R, concurrent?: number) => Observable<R>;
- multicast: (subjectFactory: () => Subject<T>) => ConnectableObservable<T>;
+ multicast: (subjectOrSubjectFactory: Subject<T>|(() => Subject<T>)) => ConnectableObservable<T>;
  observeOn: (scheduler: Scheduler, delay?: number) => Observable<T>;
  partition: (predicate: (x: T) => boolean) => Observable<T>[];
  publish: () => ConnectableObservable<T>;