cargdev/angular
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix(router): Update types for TypeScript nullability support"

Browse Source 
This reverts commit 56c46d70f7.

Broke in G3.
This commit is contained in:
Tobias Bosch
2017-04-17 09:47:59 -07:00
parent 6d930d2fc5
commit ea8ffc9841
26 changed files with 223 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/router/src/directives/router_outlet.ts
View File

@ -71,8 +71,8 @@ export class RouterOutlet implements OnDestroy {
if (!this.activated) throw new Error('Outlet is not activated');
this.location.detach();
const r = this.activated;
this.activated = null !;
this._activatedRoute = null !;
this.activated = null;
this._activatedRoute = null;
return r;
}
@ -86,8 +86,8 @@ export class RouterOutlet implements OnDestroy {
if (this.activated) {
const c = this.component;
this.activated.destroy();
this.activated = null !;
this._activatedRoute = null !;
this.activated = null;
this._activatedRoute = null;
this.deactivateEvents.emit(c);
}
}
@ -104,8 +104,8 @@ export class RouterOutlet implements OnDestroy {
this._activatedRoute = activatedRoute;
const snapshot = activatedRoute._futureSnapshot;
const component: any = <any>snapshot._routeConfig !.component;
const factory = resolver.resolveComponentFactory(component) !;
const component: any = <any>snapshot._routeConfig.component;
const factory = resolver.resolveComponentFactory(component);
const inj = ReflectiveInjector.fromResolvedProviders(providers, injector);
@ -126,10 +126,10 @@ export class RouterOutlet implements OnDestroy {
this._activatedRoute = activatedRoute;
const snapshot = activatedRoute._futureSnapshot;
const component = <any>snapshot._routeConfig !.component;
const component = <any>snapshot._routeConfig.component;
resolver = resolver || this.resolver;
const factory = resolver.resolveComponentFactory(component) !;
const factory = resolver.resolveComponentFactory(component);
const injector = new OutletInjector(activatedRoute, outletMap, this.location.injector);