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

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

This commit is contained in:
Torgeir Helgevold 2016-06-06 16:34:27 -04:00 committed by Miško Hevery
parent 57c9a07fff
commit d1c989b8a5
2 changed files with 2 additions and 1 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,6 +26,7 @@ export interface IRootScopeService {
$apply(): any; $apply(): any;
$apply(exp: string): any; $apply(exp: string): any;
$apply(exp: Function): any; $apply(exp: Function): any;
$applyAsync(): any;
$$childTail: IScope; $$childTail: IScope;
$$childHead: IScope; $$childHead: IScope;
$$nextSibling: 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) => { (injector: angular.IInjectorService, rootScope: angular.IRootScopeService) => {
ng1Injector = injector; ng1Injector = injector;
ngZone.onMicrotaskEmpty.subscribe( ngZone.onMicrotaskEmpty.subscribe(
{next: (_) => ngZone.runOutsideAngular(() => rootScope.$apply())}); {next: (_) => ngZone.runOutsideAngular(() => rootScope.$applyAsync())});
UpgradeNg1ComponentAdapterBuilder.resolve(this.downgradedComponents, injector) UpgradeNg1ComponentAdapterBuilder.resolve(this.downgradedComponents, injector)
.then(resolve, reject); .then(resolve, reject);
} }