From 3558a4f9477009b4cce7a64b848a0b0459390402 Mon Sep 17 00:00:00 2001
From: Andre Staltz <andre@staltz.com>
Date: Thu, 29 Oct 2015 11:35:12 +0200
Subject: [PATCH] refactor(skipUntil): call super(destination) constructor

Change SkipUntilSubscriber to give the destination subscriber to the
constructor in Subscriber. Adapt SkipUntilSubscriber to handle
unsubscription-on-complete correctly, by overriding unsubscribe().

Addresses #577.
---
 src/Subscriber.ts          | 18 +++++++++---------
 src/operators/skipUntil.ts | 15 +++++++++++++--
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/Subscriber.ts b/src/Subscriber.ts
index 6fec2a33568..e96bcc1c932 100644
--- a/src/Subscriber.ts
+++ b/src/Subscriber.ts
@@ -9,10 +9,10 @@ import Subscription from './Subscription';
 export default class Subscriber<T> extends Subscription<T> implements Observer<T> {
   protected destination: Observer<any>;
 
-  private _subscription: Subscription<T>;
+  protected _subscription: Subscription<T>;
+
+  protected _isUnsubscribed: boolean = false;
 
-  private _isUnsubscribed: boolean = false;
-  
   static create<T>(next    ?: (x?:any) => void,
                    error   ?: (e?:any) => void,
                    complete?: () => void): Subscriber<T> {
@@ -22,15 +22,15 @@ export default class Subscriber<T> extends Subscription<T> implements Observer<T
     subscriber._complete = (typeof complete === "function") && complete || noop;
     return subscriber;
   }
-  
+
   _next(value: T) {
     this.destination.next(value);
   }
-  
+
   _error(err: any) {
     this.destination.error(err);
   }
-  
+
   _complete() {
     this.destination.complete();
   }
@@ -38,7 +38,7 @@ export default class Subscriber<T> extends Subscription<T> implements Observer<T
   constructor(destination?: Observer<any>) {
     super();
     this.destination = destination;
-    
+
     if (!destination) {
       return;
     }
@@ -90,9 +90,9 @@ export default class Subscriber<T> extends Subscription<T> implements Observer<T
   }
 
   unsubscribe() {
-    if(this._isUnsubscribed) {
+    if (this._isUnsubscribed) {
       return;
-    } else if(this._subscription) {
+    } else if (this._subscription) {
       this._isUnsubscribed = true;
     } else {
       super.unsubscribe();
diff --git a/src/operators/skipUntil.ts b/src/operators/skipUntil.ts
index 9fc56dad1a1..f7786c1067e 100644
--- a/src/operators/skipUntil.ts
+++ b/src/operators/skipUntil.ts
@@ -19,9 +19,9 @@ class SkipUntilOperator<T, R> implements Operator<T, R> {
 class SkipUntilSubscriber<T> extends Subscriber<T> {
   private notificationSubscriber: NotificationSubscriber<any> = null;
 
-  constructor(public destination: Subscriber<T>,
+  constructor(destination: Subscriber<T>,
               private notifier: Observable<any>) {
-    super(null);
+    super(destination);
     this.notificationSubscriber = new NotificationSubscriber(this);
     this.add(this.notifier.subscribe(this.notificationSubscriber));
   }
@@ -42,6 +42,17 @@ class SkipUntilSubscriber<T> extends Subscriber<T> {
     }
     this.notificationSubscriber.unsubscribe();
   }
+
+  unsubscribe() {
+    if (this._isUnsubscribed) {
+      return;
+    } else if (this._subscription) {
+      this._subscription.unsubscribe();
+      this._isUnsubscribed = true;
+    } else {
+      super.unsubscribe();
+    }
+  }
 }
 
 class NotificationSubscriber<T> extends Subscriber<T> {