fix(upgrade): clean up scope when element is destroyed

andreialecu · andreialecu · commit 0fc9ec248e10 · 2016-04-19T01:06:14.000Z
Closes angular#8102
diff --git a/modules/angular2/src/upgrade/angular_js.ts b/modules/angular2/src/upgrade/angular_js.ts
@@ -22,6 +22,7 @@ export interface IRootScopeService {
   $new(isolate?: boolean): IScope;
   $id: string;
   $watch(expr: any, fn?: (a1?: any, a2?: any) => void): Function;
+  $destroy(): any;
   $apply(): any;
   $apply(exp: string): any;
   $apply(exp: Function): any;
diff --git a/modules/angular2/src/upgrade/downgrade_ng2_adapter.ts b/modules/angular2/src/upgrade/downgrade_ng2_adapter.ts
@@ -160,7 +160,10 @@ export class DowngradeNg2ComponentAdapter {
   }
 
   registerCleanup() {
-    this.element.bind('$destroy', () => this.viewManager.destroyRootHostView(this.hostViewRef));
+    this.element.bind('$destroy', () => {
+      this.componentScope.$destroy();
+      this.viewManager.destroyRootHostView(this.hostViewRef);
+    });
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,10 @@ export class DowngradeNg2ComponentAdapter {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`registerCleanup() {`
`163`		`- this.element.bind('$destroy', () => this.viewManager.destroyRootHostView(this.hostViewRef));`
	`163`	`+ this.element.bind('$destroy', () => {`
	`164`	`+ this.componentScope.$destroy();`
	`165`	`+ this.viewManager.destroyRootHostView(this.hostViewRef);`
	`166`	`+ });`
`164`	`167`	`}`
`165`	`168`	`}`
`166`	`169`