From 3683fb688693ae1df31e17bc26d80daf6dd7abb2 Mon Sep 17 00:00:00 2001 From: vsavkin Date: Wed, 15 Jun 2016 07:55:28 -0700 Subject: [PATCH] refactor(router): minor refactoring --- modules/@angular/router/src/apply_redirects.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/@angular/router/src/apply_redirects.ts b/modules/@angular/router/src/apply_redirects.ts index 54541dff11..813dddfa25 100644 --- a/modules/@angular/router/src/apply_redirects.ts +++ b/modules/@angular/router/src/apply_redirects.ts @@ -89,6 +89,7 @@ function expandWildCardWithParamsAgainstRouteUsingRedirect(route: Route): UrlSeg return new UrlSegment(newPaths, {}); } } + function expandRegularPathWithParamsAgainstRouteUsingRedirect( segment: UrlSegment, routes: Route[], route: Route, paths: UrlPathWithParams[], outlet: string): UrlSegment { @@ -169,9 +170,10 @@ function applyRedirectCommands( posParams: {[k: string]: UrlPathWithParams}): UrlPathWithParams[] { if (redirectTo.startsWith('/')) { const parts = redirectTo.substring(1).split('/'); - throw new GlobalRedirect(createPaths(redirectTo, parts, paths, posParams)); + return createPaths(redirectTo, parts, paths, posParams); } else { - return createPaths(redirectTo, redirectTo.split('/'), paths, posParams); + const parts = redirectTo.split('/'); + return createPaths(redirectTo, parts, paths, posParams); } }