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

refactor(router): rename queryParameters into queryParams

Browse Source
This commit is contained in:
vsavkin
2016-06-06 16:34:48 -07:00
parent 33b518ad21
commit ed50e17e5b
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/@angular/router/src/create_url_tree.ts
View File

@ -5,14 +5,14 @@ import { RouterState, ActivatedRoute } from './router_state';
import { Params, PRIMARY_OUTLET } from './shared';
export function createUrlTree(route: ActivatedRoute, urlTree: UrlTree, commands: any[],
queryParameters: Params | undefined, fragment: string | undefined): UrlTree {
queryParams: Params | undefined, fragment: string | undefined): UrlTree {
if (commands.length === 0) {
return tree(urlTree._root, urlTree, queryParameters, fragment);
return tree(urlTree._root, urlTree, queryParams, fragment);
}
const normalizedCommands = normalizeCommands(commands);
if (navigateToRoot(normalizedCommands)) {
return tree(new TreeNode<UrlSegment>(urlTree.root, []), urlTree, queryParameters, fragment);
return tree(new TreeNode<UrlSegment>(urlTree.root, []), urlTree, queryParams, fragment);
}
const startingNode = findStartingNode(normalizedCommands, urlTree, route);
@ -21,11 +21,11 @@ export function createUrlTree(route: ActivatedRoute, urlTree: UrlTree, commands:
[];
const newRoot = constructNewTree(urlTree._root, startingNode, updated);
return tree(newRoot, urlTree, queryParameters, fragment);
return tree(newRoot, urlTree, queryParams, fragment);
}
function tree(root: TreeNode<UrlSegment>, urlTree: UrlTree, queryParameters: Params | undefined, fragment: string | undefined): UrlTree {
const q = queryParameters ? stringify(queryParameters) : urlTree.queryParameters;
function tree(root: TreeNode<UrlSegment>, urlTree: UrlTree, queryParams: Params | undefined, fragment: string | undefined): UrlTree {
const q = queryParams ? stringify(queryParams) : urlTree.queryParams;
const f = fragment ? fragment : urlTree.fragment;
return new UrlTree(root, q, f);
}