fix(upgrade): fix infinite $rootScope.$digest()

andreialecu · IgorMinar · commit 7e0f02f96e59 · 2016-02-08T17:18:52.000-08:00
Fixes #6385 Closes #6386
diff --git a/modules/angular2/src/upgrade/upgrade_adapter.ts b/modules/angular2/src/upgrade/upgrade_adapter.ts
@@ -339,7 +339,7 @@ export class UpgradeAdapter {
           (injector: angular.IInjectorService, rootScope: angular.IRootScopeService) => {
             ng1Injector = injector;
             ObservableWrapper.subscribe(ngZone.onTurnDone,
-                                        (_) => { ngZone.run(() => rootScope.$apply()); });
+                                        (_) => ngZone.runOutsideAngular(() => rootScope.$apply()));
             ng1compilePromise =
                 UpgradeNg1ComponentAdapterBuilder.resolve(this.downgradedComponents, injector);
           }

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ export class UpgradeAdapter {`
`339`	`339`	`(injector: angular.IInjectorService, rootScope: angular.IRootScopeService) => {`
`340`	`340`	`ng1Injector = injector;`
`341`	`341`	`ObservableWrapper.subscribe(ngZone.onTurnDone,`
`342`		`- (_) => { ngZone.run(() => rootScope.$apply()); });`
	`342`	`+ (_) => ngZone.runOutsideAngular(() => rootScope.$apply()));`
`343`	`343`	`ng1compilePromise =`
`344`	`344`	`UpgradeNg1ComponentAdapterBuilder.resolve(this.downgradedComponents, injector);`
`345`	`345`	`}`