fix: subscription cleanup

Jaspero · Jul 10, 2019 · 42890e4 · 42890e4
1 parent b28597e
commit 42890e4
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/projects/ng-slider/src/lib/slides/slides.component.ts b/projects/ng-slider/src/lib/slides/slides.component.ts
@@ -67,6 +67,8 @@ export class SlidesComponent implements OnInit, AfterViewInit, OnDestroy {
 
   private _manager: any;
   private _slideTimeInterval: Subscription;
+  private _mouseEnterSubscription: Subscription;
+  private _mouseLeaveSubscription: Subscription;
 
   @HostListener('mouseover')
   onMouseOver() {
@@ -142,9 +144,15 @@ export class SlidesComponent implements OnInit, AfterViewInit, OnDestroy {
       this._manager.destroy();
     }
 
-    if (this._slideTimeInterval) {
-      this._slideTimeInterval.unsubscribe();
-    }
+    [
+      this._slideTimeInterval,
+      this._mouseEnterSubscription,
+      this._mouseLeaveSubscription
+    ]
+      .filter(subscription => subscription)
+      .forEach(subscription => {
+        subscription.unsubscribe();
+      });
   }
 
   ngAfterViewInit() {
@@ -389,8 +397,8 @@ export class SlidesComponent implements OnInit, AfterViewInit, OnDestroy {
       /**
        * Detect if mouse is inside/outside of page
        */
-      fromEvent(this.document, 'mouseenter').subscribe(() => this.blockAutoSlide = false);
-      fromEvent(this.document, 'mouseleave').subscribe(() => this.blockAutoSlide = true);
+      this._mouseEnterSubscription = fromEvent(this.document, 'mouseenter').subscribe(() => this.blockAutoSlide = false);
+      this._mouseLeaveSubscription = fromEvent(this.document, 'mouseleave').subscribe(() => this.blockAutoSlide = true);
 
       this._slideTimeInterval = merge(
         this.timerReset$,