honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fix(ngUpgrade): prevent digest already in progress (#9046)" 

This reverts commit d1c989b8a5.

Breaks a Karma test.
This commit is contained in:
Chuck Jazdzewski 2016-06-06 16:30:11 -07:00
parent d1c989b8a5
commit c197e2bb42
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/@angular/upgrade/src/angular_js.ts
View File

@ -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;

2
modules/@angular/upgrade/src/upgrade_adapter.ts
View File

@ -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);
}