fix(SebmGoogleMapMarker): cleanup event listeners

sebholstein · Jul 6, 2016 · c20d005 · c20d005
1 parent 1e8145c
commit c20d005
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/src/core/directives/google-map-marker.ts b/src/core/directives/google-map-marker.ts
@@ -1,4 +1,5 @@
 import {AfterContentInit, ContentChild, Directive, EventEmitter, OnChanges, OnDestroy, SimpleChange} from '@angular/core';
+import {Subscription} from 'rxjs/Subscription';
 
 import {MouseEvent} from '../events';
 import * as mapTypes from '../services/google-maps-types';
@@ -91,6 +92,7 @@ export class SebmGoogleMapMarker implements OnDestroy, OnChanges, AfterContentIn
 
   private _markerAddedToManger: boolean = false;
   private _id: string;
+  private _observableSubscriptions: Subscription[] = [];
 
   constructor(private _markerManager: MarkerManager) { this._id = (markerId++).toString(); }
 
@@ -130,16 +132,19 @@ export class SebmGoogleMapMarker implements OnDestroy, OnChanges, AfterContentIn
   }
 
   private _addEventListeners() {
-    this._markerManager.createEventObservable('click', this).subscribe(() => {
+    const cs = this._markerManager.createEventObservable('click', this).subscribe(() => {
       if (this.openInfoWindow && this._infoWindow != null) {
         this._infoWindow.open();
       }
       this.markerClick.emit(null);
     });
-    this._markerManager.createEventObservable<mapTypes.MouseEvent>('dragend', this)
-        .subscribe((e: mapTypes.MouseEvent) => {
-          this.dragEnd.emit({coords: {lat: e.latLng.lat(), lng: e.latLng.lng()}});
-        });
+    this._observableSubscriptions.push(cs);
+
+    const ds = this._markerManager.createEventObservable<mapTypes.MouseEvent>('dragend', this)
+                   .subscribe((e: mapTypes.MouseEvent) => {
+                     this.dragEnd.emit({coords: {lat: e.latLng.lat(), lng: e.latLng.lng()}});
+                   });
+    this._observableSubscriptions.push(ds);
   }
 
   /** @internal */
@@ -149,5 +154,9 @@ export class SebmGoogleMapMarker implements OnDestroy, OnChanges, AfterContentIn
   toString(): string { return 'SebmGoogleMapMarker-' + this._id.toString(); }
 
   /** @internal */
-  ngOnDestroy() { this._markerManager.deleteMarker(this); }
+  ngOnDestroy() {
+    this._markerManager.deleteMarker(this);
+    // unsubscribe all registered observable subscriptions
+    this._observableSubscriptions.forEach((s) => s.unsubscribe());
+  }
 }
diff --git a/test/services/managers/marker-manager.spec.ts b/test/services/managers/marker-manager.spec.ts
@@ -10,10 +10,11 @@ export function main() {
   describe('MarkerManager', () => {
     beforeEach(() => {
       addProviders([
-        { provide: NgZone, useFactory: () => new NgZone({enableLongStackTrace: true}) },
-        MarkerManager,
-        SebmGoogleMapMarker,
-        { provide: GoogleMapsAPIWrapper, useValue: jasmine.createSpyObj('GoogleMapsAPIWrapper', ['createMarker'])}
+        {provide: NgZone, useFactory: () => new NgZone({enableLongStackTrace: true})},
+        MarkerManager, SebmGoogleMapMarker, {
+          provide: GoogleMapsAPIWrapper,
+          useValue: jasmine.createSpyObj('GoogleMapsAPIWrapper', ['createMarker'])
+        }
       ]);
     });
 

diff --git a/test/services/maps-api-loader/lazy-maps-api-loader.spec.ts b/test/services/maps-api-loader/lazy-maps-api-loader.spec.ts
@@ -8,9 +8,11 @@ export function main() {
   describe('Service: LazyMapsAPILoader', () => {
     beforeEach(() => {
       addProviders([
-        { provide: MapsAPILoader, useClass: LazyMapsAPILoader },
-        { provide: WINDOW_GLOBAL, useValue: {} },
-        { provide: DOCUMENT_GLOBAL, useValue: jasmine.createSpyObj<Document>('Document', ['createElement'])}
+        {provide: MapsAPILoader, useClass: LazyMapsAPILoader},
+        {provide: WINDOW_GLOBAL, useValue: {}}, {
+          provide: DOCUMENT_GLOBAL,
+          useValue: jasmine.createSpyObj<Document>('Document', ['createElement'])
+        }
       ]);
     });