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

cleanup(router): make names consistent

Browse Source
This commit is contained in:
vsavkin
2016-05-02 14:48:26 -07:00
parent 89704e0f93
commit 3aa2606ff1
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/@angular/router/src/router.ts
View File

@ -52,14 +52,14 @@ export class Router {
return this._navigate(this._urlSerializer.parse(url));
}
navigate(changes: any[], segment?: RouteSegment): Promise<void> {
return this._navigate(this.createUrlTree(changes, segment));
navigate(commands: any[], segment?: RouteSegment): Promise<void> {
return this._navigate(this.createUrlTree(commands, segment));
}
dispose(): void { ObservableWrapper.dispose(this._locationSubscription); }
private _createInitialTree(): RouteTree {
let root = new RouteSegment([new UrlSegment("", null, null)], null, DEFAULT_OUTLET_NAME,
let root = new RouteSegment([new UrlSegment("", {}, null)], {}, DEFAULT_OUTLET_NAME,
this._rootComponentType, null);
return new RouteTree(new TreeNode<RouteSegment>(root, []));
}
@ -85,13 +85,9 @@ export class Router {
});
}
createUrlTree(changes: any[], segment?: RouteSegment): UrlTree {
if (isPresent(this._prevTree)) {
let s = isPresent(segment) ? segment : this._prevTree.root;
return link(s, this._prevTree, this.urlTree, changes);
} else {
return null;
}
createUrlTree(commands: any[], segment?: RouteSegment): UrlTree {
let s = isPresent(segment) ? segment : this._prevTree.root;
return link(s, this._prevTree, this.urlTree, commands);
}
serializeUrl(url: UrlTree): string { return this._urlSerializer.serialize(url); }