Merge pull request #943 from IgniteUI/fix-issue-940

Clear intervals and subscriptions when the component is destroyed
IgniteUI · Feb 13, 2019 · 1940b88 · 1940b88
2 parents 8c45c6c + 6ffe4f9
commit 1940b88
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/app/grid-finjs/grid-finjs-demo.component.ts b/src/app/grid-finjs/grid-finjs-demo.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, ElementRef, NgZone, OnInit, QueryList, ViewChild } from "@angular/core";
+import { AfterViewInit, Component, ElementRef, NgZone, OnDestroy, OnInit, QueryList, ViewChild } from "@angular/core";
 import { DefaultSortingStrategy, IgxButtonGroupComponent, IgxColumnComponent,
     IgxGridCellComponent, IgxGridComponent, IgxSliderComponent,
     SortingDirection} from "igniteui-angular";
@@ -40,7 +40,7 @@ class Button {
     styleUrls: ["./grid-finjs-demo.component.scss"],
     templateUrl: "./grid-finjs-demo.component.html"
 })
-export class FinJSDemoComponent implements OnInit, AfterViewInit {
+export class FinJSDemoComponent implements OnInit, AfterViewInit, OnDestroy {
     @ViewChild("grid1") public grid1: IgxGridComponent;
     @ViewChild("buttonGroup1") public buttonGroup1: IgxButtonGroupComponent;
     @ViewChild("slider1") public volumeSlider: IgxSliderComponent;
@@ -216,6 +216,10 @@ export class FinJSDemoComponent implements OnInit, AfterViewInit {
         return this.elRef.nativeElement.parentElement.parentElement;
     }
 
+    public ngOnDestroy() {
+        this.stopFeed();
+    }
+
     public toggleToolbar(event: any) {
         this.grid1.showToolbar = !this.grid1.showToolbar;
     }

diff --git a/src/app/treegrid-finjs/tree-grid-finjs-sample.component.ts b/src/app/treegrid-finjs/tree-grid-finjs-sample.component.ts
@@ -1,5 +1,5 @@
 
-import { AfterViewInit, Component, ElementRef, NgZone, ViewChild } from "@angular/core";
+import { AfterViewInit, Component, ElementRef, NgZone, OnDestroy, ViewChild } from "@angular/core";
 import { AbsoluteScrollStrategy, ConnectedPositioningStrategy, HorizontalAlignment, IgxButtonGroupComponent,
     IgxSliderComponent, IgxTreeGridComponent, OverlaySettings, PositionSettings,
     VerticalAlignment} from "igniteui-angular";
@@ -42,7 +42,7 @@ export class Button {
     templateUrl: "./tree-grid-finjs-sample.component.html"
 })
 
-export class TreeGridFinJSComponent implements AfterViewInit  {
+export class TreeGridFinJSComponent implements AfterViewInit, OnDestroy  {
     @ViewChild("grid1") public grid1: IgxTreeGridComponent;
     @ViewChild("buttonGroup1") public buttonGroup1: IgxButtonGroupComponent;
 
@@ -177,6 +177,10 @@ export class TreeGridFinJSComponent implements AfterViewInit  {
         return this.elRef.nativeElement.parentElement.parentElement;
     }
 
+    public ngOnDestroy() {
+        this.stopFeed();
+    }
+
     public toggleToolbar(event: any) {
         this.grid1.showToolbar = !this.grid1.showToolbar;
     }