Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix($route): correctly extract path params if path contains question mark or hash #16672

Closed
wants to merge 8 commits into from
Closed

fix($route): correctly extract path params if path contains question mark or hash #16672

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a1dbd3
fix($route): correctly extract path params if path contains question …
susisu Aug 20, 2018
afff809
fixup! fix($route): correctly extract path params if path contains qu…
gkalpak Aug 23, 2018
ff1d24e
test(ngMocks): use correct method name in `$httpBackend` test
gkalpak Aug 21, 2018
08c095a
refactor(ngRoute): do not unnecessarily return `originalPath` in `rou…
gkalpak Aug 21, 2018
af75815
refactor(ngMocks): clean up `MockHttpExpectation#params()`
gkalpak Aug 21, 2018
db8394b
refactor(ngMocks): ignore query/hash when extracting path params for …
gkalpak Aug 21, 2018
eaf7a5d
refactor(ngMocks): clean up `MockHttpExpectation`
gkalpak Aug 25, 2018
9b9e25f
refactor(ngMocks): simplify `routeToRegExp` by assuming `path` has qu…
gkalpak Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor(ngRoute): do not unnecessarily return originalPath in `rou… 
…teToRegExp`
  • Loading branch information
@gkalpak
gkalpak committed Aug 25, 2018
commit 08c095a8e3c94e8316a73bfa55f948b356a4a9e4
3 changes: 2 additions & 1 deletion src/ngRoute/route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ function $RouteProvider() {
}
routes[path] = angular.extend(
routeCopy,
{originalPath: path},
path && routeToRegExp(path, routeCopy)
);

Expand All @@ -235,7 +236,7 @@ function $RouteProvider() {
: path + '/';

routes[redirectPath] = angular.extend(
{redirectTo: path},
{originalPath: path, redirectTo: path},
routeToRegExp(redirectPath, routeCopy)
);
}
Expand Down
1 change: 0 additions & 1 deletion src/routeToRegExp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ function routeToRegExp(pathOrUrl, opts) {
}

return {
originalPath: pathOrUrl,
keys: keys,
regexp: new RegExp(
'^' + pattern + '(?:[?#]|$)',
Expand Down