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

refactor(router): remove usage of deprecated Renderer

This commit is contained in:
Pawel Kozlowski 2017-06-20 13:24:39 +02:00 committed by Matias Niemelä
parent e80851d98b
commit 3165fd3dc9
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/router/src/directives/router_link.ts
View File

@ -7,7 +7,7 @@
*/ */
import {LocationStrategy} from '@angular/common'; import {LocationStrategy} from '@angular/common';
import {Attribute, Directive, ElementRef, HostBinding, HostListener, Input, OnChanges, OnDestroy, Renderer, isDevMode} from '@angular/core'; import {Attribute, Directive, ElementRef, HostBinding, HostListener, Input, OnChanges, OnDestroy, Renderer2, isDevMode} from '@angular/core';
import {Subscription} from 'rxjs/Subscription'; import {Subscription} from 'rxjs/Subscription';
import {QueryParamsHandling} from '../config'; import {QueryParamsHandling} from '../config';
@ -106,9 +106,9 @@ export class RouterLink {
constructor( constructor(
private router: Router, private route: ActivatedRoute, private router: Router, private route: ActivatedRoute,
@Attribute('tabindex') tabIndex: string, renderer: Renderer, el: ElementRef) { @Attribute('tabindex') tabIndex: string, renderer: Renderer2, el: ElementRef) {
if (tabIndex == null) { if (tabIndex == null) {
renderer.setElementAttribute(el.nativeElement, 'tabindex', '0'); renderer.setAttribute(el.nativeElement, 'tabindex', '0');
} }
} }

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

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import {AfterContentInit, ChangeDetectorRef, ContentChildren, Directive, ElementRef, Input, OnChanges, OnDestroy, QueryList, Renderer, SimpleChanges} from '@angular/core'; import {AfterContentInit, ChangeDetectorRef, ContentChildren, Directive, ElementRef, Input, OnChanges, OnDestroy, QueryList, Renderer2, SimpleChanges} from '@angular/core';
import {Subscription} from 'rxjs/Subscription'; import {Subscription} from 'rxjs/Subscription';
import {NavigationEnd} from '../events'; import {NavigationEnd} from '../events';
import {Router} from '../router'; import {Router} from '../router';
@ -91,7 +91,7 @@ export class RouterLinkActive implements OnChanges,
@Input() routerLinkActiveOptions: {exact: boolean} = {exact: false}; @Input() routerLinkActiveOptions: {exact: boolean} = {exact: false};
constructor( constructor(
private router: Router, private element: ElementRef, private renderer: Renderer, private router: Router, private element: ElementRef, private renderer: Renderer2,
private cdr: ChangeDetectorRef) { private cdr: ChangeDetectorRef) {
this.subscription = router.events.subscribe(s => { this.subscription = router.events.subscribe(s => {
if (s instanceof NavigationEnd) { if (s instanceof NavigationEnd) {
@ -123,8 +123,13 @@ export class RouterLinkActive implements OnChanges,
// react only when status has changed to prevent unnecessary dom updates // react only when status has changed to prevent unnecessary dom updates
if (this.active !== hasActiveLinks) { if (this.active !== hasActiveLinks) {
this.classes.forEach( this.classes.forEach((c) => {
c => this.renderer.setElementClass(this.element.nativeElement, c, hasActiveLinks)); if (hasActiveLinks) {
this.renderer.addClass(this.element.nativeElement, c);
} else {
this.renderer.removeClass(this.element.nativeElement, c);
}
});
Promise.resolve(hasActiveLinks).then(active => this.active = active); Promise.resolve(hasActiveLinks).then(active => this.active = active);
} }
} }

4
tools/public_api_guard/router/router.d.ts vendored
View File

@ -300,7 +300,7 @@ export declare class RouterLink {
routerLink: any[] | string; routerLink: any[] | string;
skipLocationChange: boolean; skipLocationChange: boolean;
readonly urlTree: UrlTree; readonly urlTree: UrlTree;
constructor(router: Router, route: ActivatedRoute, tabIndex: string, renderer: Renderer, el: ElementRef); constructor(router: Router, route: ActivatedRoute, tabIndex: string, renderer: Renderer2, el: ElementRef);
onClick(): boolean; onClick(): boolean;
} }
@ -313,7 +313,7 @@ export declare class RouterLinkActive implements OnChanges, OnDestroy, AfterCont
routerLinkActiveOptions: { routerLinkActiveOptions: {
exact: boolean; exact: boolean;
}; };
constructor(router: Router, element: ElementRef, renderer: Renderer, cdr: ChangeDetectorRef); constructor(router: Router, element: ElementRef, renderer: Renderer2, cdr: ChangeDetectorRef);
ngAfterContentInit(): void; ngAfterContentInit(): void;
ngOnChanges(changes: SimpleChanges): void; ngOnChanges(changes: SimpleChanges): void;
ngOnDestroy(): void; ngOnDestroy(): void;