fixup! feat(forEach): now allows cancellation by passing a Subscription

ReactiveX · Jul 30, 2018 · cb6dd81 · cb6dd81
1 parent 3437239
commit cb6dd81
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/internal/Observable.ts b/src/internal/Observable.ts
@@ -325,12 +325,16 @@ export class Observable<T> implements Subscribable<T> {
    */
   forEach(next: (value: T) => void, promiseCtorOrSubscription?: PromiseConstructorLike|Subscription): Promise<void> {
     let promiseCtor: PromiseConstructorLike;
-    let subs = isSubscription(promiseCtorOrSubscription) ? promiseCtorOrSubscription : undefined;
+    let subs: Subscription;
+    if (isSubscription(promiseCtorOrSubscription)) {
+      subs = promiseCtorOrSubscription;
+    } else {
+      subs = new Subscription();
+      promiseCtor = promiseCtorOrSubscription;
+    }
     promiseCtor = getPromiseCtor(promiseCtor);
 
     return new promiseCtor<void>((resolve, reject) => {
-      subs = subs || new Subscription();
-
       // If the promise resolves with a complete, calling reject should noop.
       subs.add(() => reject(new Error('Observable forEach unsubscribed')));