refactor(ngRoute): do not unnecessarily return originalPath in routeToRegExp

gkalpak · gkalpak · commit 9824c59dca4a · 2018-08-25T23:38:43.000+03:00
diff --git a/src/ngRoute/route.js b/src/ngRoute/route.js
@@ -225,6 +225,7 @@ function $RouteProvider() {
     }
     routes[path] = angular.extend(
       routeCopy,
+      {originalPath: path},
       path && routeToRegExp(path, routeCopy)
     );
 
@@ -235,7 +236,7 @@ function $RouteProvider() {
             : path + '/';
 
       routes[redirectPath] = angular.extend(
-        {redirectTo: path},
+        {originalPath: path, redirectTo: path},
         routeToRegExp(redirectPath, routeCopy)
       );
     }
diff --git a/src/routeToRegExp.js b/src/routeToRegExp.js
@@ -36,7 +36,6 @@ function routeToRegExp(pathOrUrl, opts) {
   }
 
   return {
-    originalPath: pathOrUrl,
     keys: keys,
     regexp: new RegExp(
       '^' + pattern + '(?:[?#]|$)',

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,7 @@ function $RouteProvider() {`
`225`	`225`	`}`
`226`	`226`	`routes[path] = angular.extend(`
`227`	`227`	`routeCopy,`
	`228`	`+ {originalPath: path},`
`228`	`229`	`path && routeToRegExp(path, routeCopy)`
`229`	`230`	`);`
`230`	`231`
`@@ -235,7 +236,7 @@ function $RouteProvider() {`
`235`	`236`	`: path + '/';`
`236`	`237`
`237`	`238`	`routes[redirectPath] = angular.extend(`
`238`		`- {redirectTo: path},`
	`239`	`+ {originalPath: path, redirectTo: path},`
`239`	`240`	`routeToRegExp(redirectPath, routeCopy)`
`240`	`241`	`);`
`241`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ function routeToRegExp(pathOrUrl, opts) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`return {`
`39`		`- originalPath: pathOrUrl,`
`40`	`39`	`keys: keys,`
`41`	`40`	`regexp: new RegExp(`
`42`	`41`	`'^' + pattern + '(?:[?#]\|$)',`