cargdev/angular
1
0
Fork 0
Code Issues 3 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/router.ts
View File

@ -35,7 +35,7 @@ import {ActivatedRoute, ActivatedRouteSnapshot, RouterState, RouterStateSnapshot
import {PRIMARY_OUTLET, Params, isNavigationCancelingError} from './shared';
import {DefaultUrlHandlingStrategy, UrlHandlingStrategy} from './url_handling_strategy';
import {UrlSerializer, UrlTree, containsTree, createEmptyUrlTree} from './url_tree';
import {andObservables, forEach, merge, shallowEqual, waitForMap, wrapIntoObservable} from './utils/collection';
import {andObservables, forEach, shallowEqual, waitForMap, wrapIntoObservable} from './utils/collection';
import {TreeNode} from './utils/tree';
declare let Zone: any;
@ -411,7 +411,7 @@ export class Router {
if (queryParamsHandling) {
switch (queryParamsHandling) {
case 'merge':
q = merge(this.currentUrlTree.queryParams, queryParams);
q = {...this.currentUrlTree.queryParams, ...queryParams};
break;
case 'preserve':
q = this.currentUrlTree.queryParams;
@ -981,7 +981,7 @@ export class PreActivation {
const resolve = future._resolve;
return map.call(this.resolveNode(resolve, future), (resolvedData: any): any => {
future._resolvedData = resolvedData;
future.data = merge(future.data, inheritedParamsDataResolve(future).resolve);
future.data = {...future.data, ...inheritedParamsDataResolve(future).resolve};
return null;
});
}