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

refactor(router): rename navigate and navigateInstruction methods

Browse Source
This commit is contained in:
Brian Ford
2015-09-08 21:41:56 -07:00
parent 5e49d7e624
commit acc2722cb8
17 changed files with 126 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/angular2/src/router/router.ts
View File

@ -159,7 +159,7 @@ export class Router {
* If the given URL begins with a `/`, router will navigate absolutely.
* If the given URL does not begin with `/`, the router will navigate relative to this component.
*/
navigate(url: string, _skipLocationChange: boolean = false): Promise<any> {
navigateByUrl(url: string, _skipLocationChange: boolean = false): Promise<any> {
return this._currentNavigation = this._currentNavigation.then((_) => {
this.lastNavigationAttempt = url;
this._startNavigating();
@ -177,8 +177,8 @@ export class Router {
* Navigate via the provided instruction. Returns a promise that resolves when navigation is
* complete.
*/
navigateInstruction(instruction: Instruction,
_skipLocationChange: boolean = false): Promise<any> {
navigateByInstruction(instruction: Instruction,
_skipLocationChange: boolean = false): Promise<any> {
if (isBlank(instruction)) {
return _resolveToFalse;
}
@ -373,7 +373,7 @@ export class Router {
if (isBlank(this.lastNavigationAttempt)) {
return this._currentNavigation;
}
return this.navigate(this.lastNavigationAttempt);
return this.navigateByUrl(this.lastNavigationAttempt);
}
@ -445,10 +445,11 @@ export class RootRouter extends Router {
hostComponent: Type) {
super(registry, pipeline, null, hostComponent);
this._location = location;
this._location.subscribe((change) => this.navigate(change['url'], isPresent(change['pop'])));
this._location.subscribe((change) =>
this.navigateByUrl(change['url'], isPresent(change['pop'])));
this.registry.configFromComponent(hostComponent);
this.navigate(location.path());
this.navigateByUrl(location.path());
}
commit(instruction: Instruction, _skipLocationChange: boolean = false): Promise<any> {
@ -471,15 +472,15 @@ class ChildRouter extends Router {
}
navigate(url: string, _skipLocationChange: boolean = false): Promise<any> {
navigateByUrl(url: string, _skipLocationChange: boolean = false): Promise<any> {
// Delegate navigation to the root router
return this.parent.navigate(url, _skipLocationChange);
return this.parent.navigateByUrl(url, _skipLocationChange);
}
navigateInstruction(instruction: Instruction,
_skipLocationChange: boolean = false): Promise<any> {
navigateByInstruction(instruction: Instruction,
_skipLocationChange: boolean = false): Promise<any> {
// Delegate navigation to the root router
return this.parent.navigateInstruction(instruction, _skipLocationChange);
return this.parent.navigateByInstruction(instruction, _skipLocationChange);
}
}

2
modules/angular2/src/router/router_link.ts
View File

@ -66,7 +66,7 @@ export class RouterLink {
}
onClick(): boolean {
this._router.navigateInstruction(this._navigationInstruction);
this._router.navigateByInstruction(this._navigationInstruction);
return false;
}
}