fix: remove internal usages of deprecated overrideOnTurnDone
Closes #5079
This commit is contained in:
parent
8dc079eee5
commit
c814dfbfa5
|
@ -6,7 +6,12 @@ import {
|
|||
APP_COMPONENT,
|
||||
APP_ID_RANDOM_PROVIDER
|
||||
} from './application_tokens';
|
||||
import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async';
|
||||
import {
|
||||
Promise,
|
||||
PromiseWrapper,
|
||||
PromiseCompleter,
|
||||
ObservableWrapper
|
||||
} from 'angular2/src/core/facade/async';
|
||||
import {ListWrapper} from 'angular2/src/core/facade/collection';
|
||||
import {Reflector, reflector} from 'angular2/src/core/reflection/reflection';
|
||||
import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability';
|
||||
|
@ -369,7 +374,8 @@ export class ApplicationRef_ extends ApplicationRef {
|
|||
constructor(private _platform: PlatformRef_, private _zone: NgZone, private _injector: Injector) {
|
||||
super();
|
||||
if (isPresent(this._zone)) {
|
||||
this._zone.overrideOnTurnDone(() => this.tick());
|
||||
ObservableWrapper.subscribe(this._zone.onTurnDone,
|
||||
(_) => { this._zone.run(() => { this.tick(); }); });
|
||||
}
|
||||
this._enforceNoNewChanges = assertionsEnabled();
|
||||
}
|
||||
|
|
|
@ -16,6 +16,7 @@ import {
|
|||
import {applicationDomProviders} from 'angular2/src/core/application_common';
|
||||
import {applicationCommonProviders} from 'angular2/src/core/application_ref';
|
||||
import {compilerProviders} from 'angular2/src/core/compiler/compiler';
|
||||
import {ObservableWrapper} from 'angular2/src/core/facade/async';
|
||||
|
||||
import {getComponentInfo, ComponentInfo} from './metadata';
|
||||
import {onError, controllerKey} from './util';
|
||||
|
@ -342,7 +343,8 @@ export class UpgradeAdapter {
|
|||
'$rootScope',
|
||||
(injector: angular.IInjectorService, rootScope: angular.IRootScopeService) => {
|
||||
ng1Injector = injector;
|
||||
ngZone.overrideOnTurnDone(() => rootScope.$apply());
|
||||
ObservableWrapper.subscribe(ngZone.onTurnDone,
|
||||
(_) => { ngZone.run(() => rootScope.$apply()); });
|
||||
ng1compilePromise =
|
||||
UpgradeNg1ComponentAdapterBuilder.resolve(this.downgradedComponents, injector);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue