From c197e2bb4212afbbe8f35ea6d90a413c14f8b5d4 Mon Sep 17 00:00:00 2001 From: Chuck Jazdzewski Date: Mon, 6 Jun 2016 16:30:11 -0700 Subject: [PATCH] Revert "fix(ngUpgrade): prevent digest already in progress (#9046)" This reverts commit d1c989b8a512aaae5e6e1002c58c3a37d6c27153. Breaks a Karma test. --- modules/@angular/upgrade/src/angular_js.ts | 1 - modules/@angular/upgrade/src/upgrade_adapter.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/@angular/upgrade/src/angular_js.ts b/modules/@angular/upgrade/src/angular_js.ts index eeb3782bdd..02d6fd6d31 100644 --- a/modules/@angular/upgrade/src/angular_js.ts +++ b/modules/@angular/upgrade/src/angular_js.ts @@ -26,7 +26,6 @@ export interface IRootScopeService { $apply(): any; $apply(exp: string): any; $apply(exp: Function): any; - $applyAsync(): any; $$childTail: IScope; $$childHead: IScope; $$nextSibling: IScope; diff --git a/modules/@angular/upgrade/src/upgrade_adapter.ts b/modules/@angular/upgrade/src/upgrade_adapter.ts index 522574c6d4..6f93bb039a 100644 --- a/modules/@angular/upgrade/src/upgrade_adapter.ts +++ b/modules/@angular/upgrade/src/upgrade_adapter.ts @@ -366,7 +366,7 @@ export class UpgradeAdapter { (injector: angular.IInjectorService, rootScope: angular.IRootScopeService) => { ng1Injector = injector; ngZone.onMicrotaskEmpty.subscribe( - {next: (_) => ngZone.runOutsideAngular(() => rootScope.$applyAsync())}); + {next: (_) => ngZone.runOutsideAngular(() => rootScope.$apply())}); UpgradeNg1ComponentAdapterBuilder.resolve(this.downgradedComponents, injector) .then(resolve, reject); }