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

style: clang-format the code

Browse Source
This commit is contained in:
Victor Berchet
2016-12-09 11:19:55 -08:00
parent b4db73d0bf
commit c8baf51f4f
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
import {ActivatedRoute} from './router_state';
import {PRIMARY_OUTLET, Params} from './shared';
import {UrlSegment, UrlSegmentGroup, UrlTree} from './url_tree';
import {forEach, shallowEqual, last} from './utils/collection';
import {forEach, last, shallowEqual} from './utils/collection';
export function createUrlTree(
route: ActivatedRoute, urlTree: UrlTree, commands: any[], queryParams: Params,
@ -29,8 +29,7 @@ export function createUrlTree(
const segmentGroup = startingPosition.processChildren ?
updateSegmentGroupChildren(
startingPosition.segmentGroup, startingPosition.index, nav.commands) :
updateSegmentGroup(
startingPosition.segmentGroup, startingPosition.index, nav.commands);
updateSegmentGroup(startingPosition.segmentGroup, startingPosition.index, nav.commands);
return tree(startingPosition.segmentGroup, segmentGroup, urlTree, queryParams, fragment);
}
@ -65,7 +64,8 @@ function replaceSegment(
}
class Navigation {
constructor(public isAbsolute: boolean, public numberOfDoubleDots: number, public commands: any[]) {
constructor(
public isAbsolute: boolean, public numberOfDoubleDots: number, public commands: any[]) {
if (isAbsolute && commands.length > 0 && isMatrixParams(commands[0])) {
throw new Error('Root segment cannot have matrix parameters');
}
@ -148,8 +148,8 @@ function findStartingPosition(nav: Navigation, tree: UrlTree, route: ActivatedRo
const modifier = isMatrixParams(nav.commands[0]) ? 0 : 1;
const index = route.snapshot._lastPathIndex + modifier;
return createPositionApplyingDoubleDots(route.snapshot._urlSegment, index, nav.numberOfDoubleDots);
return createPositionApplyingDoubleDots(
route.snapshot._urlSegment, index, nav.numberOfDoubleDots);
}
function createPositionApplyingDoubleDots(

2
modules/@angular/router/src/url_tree.ts
View File

@ -20,7 +20,7 @@ export function containsTree(container: UrlTree, containee: UrlTree, exact: bool
}
return containsQueryParams(container.queryParams, containee.queryParams) &&
containsSegmentGroup(container.root, containee.root);
containsSegmentGroup(container.root, containee.root);
}
function equalQueryParams(