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

refactor(router): use object spread operator instead of merge fn

Browse Source
This commit is contained in:
Dzmitry Shylovich
2017-03-26 17:15:10 +03:00
committed by Victor Berchet
parent b7fa5dec21
commit 606b8fafb0
5 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/router/src/recognize.ts
View File

@ -15,7 +15,7 @@ import {Data, ResolveData, Route, Routes} from './config';
import {ActivatedRouteSnapshot, RouterStateSnapshot, inheritedParamsDataResolve} from './router_state';
import {PRIMARY_OUTLET, defaultUrlMatcher} from './shared';
import {UrlSegment, UrlSegmentGroup, UrlTree, mapChildrenIntoArray} from './url_tree';
import {forEach, last, merge} from './utils/collection';
import {forEach, last} from './utils/collection';
import {TreeNode} from './utils/tree';
class NoMatch {}
@ -180,7 +180,7 @@ function match(segmentGroup: UrlSegmentGroup, route: Route, segments: UrlSegment
const posParams: {[n: string]: string} = {};
forEach(res.posParams, (v: UrlSegment, k: string) => { posParams[k] = v.path; });
const parameters = merge(posParams, res.consumed[res.consumed.length - 1].parameters);
const parameters = {...posParams, ...res.consumed[res.consumed.length - 1].parameters};
return {consumedSegments: res.consumed, lastChild: res.consumed.length, parameters};
}
@ -259,7 +259,7 @@ function addEmptyPathsToChildrenIfNeeded(
res[getOutlet(r)] = s;
}
}
return merge(children, res);
return {...children, ...res};
}
function createChildrenForEmptyPaths(