import { from } from '../observable/from';
import { isArray } from '../util/isArray';
-import { OuterSubscriber } from '../OuterSubscriber';
-import { InnerSubscriber } from '../InnerSubscriber';
-import { subscribeToResult } from '../util/subscribeToResult';
+import { SimpleOuterSubscriber, SimpleInnerSubscriber, innerSubscribe } from '../innerSubscribe';
export function onErrorResumeNext(...nextSources) {
if (nextSources.length === 1 && isArray(nextSources[0])) {
nextSources = nextSources[0];
return (source) => source.lift(new OnErrorResumeNextOperator(nextSources));
}
export function onErrorResumeNextStatic(...nextSources) {
- let source = null;
+ let source = undefined;
if (nextSources.length === 1 && isArray(nextSources[0])) {
nextSources = nextSources[0];
}
source = nextSources.shift();
- return from(source, null).lift(new OnErrorResumeNextOperator(nextSources));
+ return from(source).lift(new OnErrorResumeNextOperator(nextSources));
}
class OnErrorResumeNextOperator {
constructor(nextSources) {
return source.subscribe(new OnErrorResumeNextSubscriber(subscriber, this.nextSources));
}
}
-class OnErrorResumeNextSubscriber extends OuterSubscriber {
+class OnErrorResumeNextSubscriber extends SimpleOuterSubscriber {
constructor(destination, nextSources) {
super(destination);
this.destination = destination;
this.nextSources = nextSources;
}
- notifyError(error, innerSub) {
+ notifyError() {
this.subscribeToNextSource();
}
- notifyComplete(innerSub) {
+ notifyComplete() {
this.subscribeToNextSource();
}
_error(err) {
subscribeToNextSource() {
const next = this.nextSources.shift();
if (!!next) {
- const innerSubscriber = new InnerSubscriber(this, undefined, undefined);
+ const innerSubscriber = new SimpleInnerSubscriber(this);
const destination = this.destination;
destination.add(innerSubscriber);
- const innerSubscription = subscribeToResult(this, next, undefined, undefined, innerSubscriber);
+ const innerSubscription = innerSubscribe(next, innerSubscriber);
if (innerSubscription !== innerSubscriber) {
destination.add(innerSubscription);
}