fix(menu,tooltip): Ensure subscription exists before unsubscribing.

trshafer · trshafer · commit 919c29dff514 · 2017-02-13T09:06:37.000-08:00
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
@@ -69,7 +69,9 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {
   }
 
   ngOnDestroy() {
-    this._tabSubscription.unsubscribe();
+    if (this._tabSubscription) {
+      this._tabSubscription.unsubscribe();
+    }
   }
 
   /**
diff --git a/src/lib/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
@@ -154,7 +154,9 @@ export class MdTooltip implements OnInit, OnDestroy {
       this._disposeTooltip();
     }
 
-    this.scrollSubscription.unsubscribe();
+    if (this.scrollSubscription) {
+      this.scrollSubscription.unsubscribe();
+    }
   }
 
   /** Shows the tooltip after the delay in ms, defaults to tooltip-delay-show or 0ms if no input */

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,9 @@ export class MdMenu implements AfterContentInit, MdMenuPanel, OnDestroy {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`ngOnDestroy() {`
`72`		`- this._tabSubscription.unsubscribe();`
	`72`	`+ if (this._tabSubscription) {`
	`73`	`+ this._tabSubscription.unsubscribe();`
	`74`	`+ }`
`73`	`75`	`}`
`74`	`76`
`75`	`77`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,9 @@ export class MdTooltip implements OnInit, OnDestroy {`
`154`	`154`	`this._disposeTooltip();`
`155`	`155`	`}`
`156`	`156`
`157`		`- this.scrollSubscription.unsubscribe();`
	`157`	`+ if (this.scrollSubscription) {`
	`158`	`+ this.scrollSubscription.unsubscribe();`
	`159`	`+ }`
`158`	`160`	`}`
`159`	`161`
`160`	`162`	`/** Shows the tooltip after the delay in ms, defaults to tooltip-delay-show or 0ms if no input */`