From 4c16aa6651060b2f5d7ff2465698a2ad48456472 Mon Sep 17 00:00:00 2001
From: Ben Lesh <blesh@netflix.com>
Date: Tue, 22 Sep 2015 13:52:30 -0700
Subject: [PATCH] feat(mergeAll): now supports promises, iterables and
 lowercase-o observables

---
 src/operators/mergeAll-support.ts | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/operators/mergeAll-support.ts b/src/operators/mergeAll-support.ts
index 71d2111f4e..bd3c728c59 100644
--- a/src/operators/mergeAll-support.ts
+++ b/src/operators/mergeAll-support.ts
@@ -3,6 +3,8 @@ import Operator from '../Operator';
 import Subscriber from '../Subscriber';
 import Observer from '../Observer';
 import Subscription from '../Subscription';
+import OuterSubscriber from '../OuterSubscriber';
+import subscribeToResult from '../util/subscribeToResult';
 
 export class MergeAllOperator<T, R> implements Operator<T, R> {
   constructor(private concurrent: number) {
@@ -14,10 +16,11 @@ export class MergeAllOperator<T, R> implements Operator<T, R> {
   }
 }
 
-export class MergeAllSubscriber<T> extends Subscriber<T> {
+export class MergeAllSubscriber<T, R> extends OuterSubscriber<T, R> {
   private hasCompleted: boolean = false;
   private buffer: Observable<any>[] = [];
   private active: number = 0;
+  
   constructor(destination: Observer<T>, private concurrent:number) {
     super(destination);
   }
@@ -28,7 +31,7 @@ export class MergeAllSubscriber<T> extends Subscriber<T> {
         this.destination.next(observable.value);
       } else {
         this.active++;
-        this.add(observable.subscribe(new MergeAllInnerSubscriber(this.destination, this)))
+        this.add(subscribeToResult<T, R>(this, observable));
       }
     } else {
       this.buffer.push(observable);
@@ -52,14 +55,4 @@ export class MergeAllSubscriber<T> extends Subscriber<T> {
       this.destination.complete();
     }
   }
-}
-
-export class MergeAllInnerSubscriber<T> extends Subscriber<T> {
-  constructor(destination: Observer<T>, private parent: MergeAllSubscriber<T>) {
-    super(destination);
-  }
-  
-  _complete() {
-    this.parent.notifyComplete(this);
-  }
 }
\ No newline at end of file