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

refactor(core): remove getters for packages/animations, language-service, platform-browser, router (#19151)

Browse Source 
PR Close #19151
This commit is contained in:
Yuan Gao
2017-09-11 12:39:44 -07:00
committed by Igor Minar
parent 17eaef0311
commit 549f2254b4
13 changed files with 109 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/router/src/directives/router_link_active.ts
View File

@ -86,7 +86,7 @@ export class RouterLinkActive implements OnChanges,
private classes: string[] = [];
private subscription: Subscription;
private active: boolean = false;
public readonly isActive: boolean = false;
@Input() routerLinkActiveOptions: {exact: boolean} = {exact: false};
@ -100,7 +100,6 @@ export class RouterLinkActive implements OnChanges,
});
}
get isActive(): boolean { return this.active; }
ngAfterContentInit(): void {
this.links.changes.subscribe(_ => this.update());
@ -122,7 +121,7 @@ export class RouterLinkActive implements OnChanges,
const hasActiveLinks = this.hasActiveLinks();
// react only when status has changed to prevent unnecessary dom updates
if (this.active !== hasActiveLinks) {
if (this.isActive !== hasActiveLinks) {
this.classes.forEach((c) => {
if (hasActiveLinks) {
this.renderer.addClass(this.element.nativeElement, c);
@ -130,7 +129,9 @@ export class RouterLinkActive implements OnChanges,
this.renderer.removeClass(this.element.nativeElement, c);
}
});
Promise.resolve(hasActiveLinks).then(active => this.active = active);
Promise.resolve(hasActiveLinks).then(active => (this as{
isActive: boolean
}).isActive = active);
}
}

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

@ -128,7 +128,7 @@ export class RouterOutlet implements OnDestroy, OnInit {
}
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 childContexts = this.parentContexts.getOrCreateContext(this.name).children;