fix(router): do not require the creation of empty-path routes when no… #12772
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vsavkin
added
the
action: review
vicb
reviewed
Nov 9, 2016
| @@ -655,13 +675,13 @@ describe('Integration', () => { | |||
| expect(cmp.activations.length).toEqual(1); | |||
| expect(cmp.activations[0] instanceof BlankCmp).toBe(true); | |||
|
|
|||
| router.navigateByUrl('/simple'); | |||
| router.navigateByUrl('/simple').catch(e => console.log(e)); | |||
vicb
reviewed
Nov 9, 2016
| const parts = path.split('/'); | ||
| const positionalParamSegments: {[k: string]: UrlSegment} = {}; | ||
| const consumedSegments: UrlSegment[] = []; | ||
| const matcher = route.matcher ? route.matcher : defaultUrlMatcher; |
There was a problem hiding this comment.
route.matcher || defaultUrlMatcher
vicb
reviewed
Nov 9, 2016
| * @experimental | ||
| */ | ||
| export type UrlMatchResult = { | ||
| consumed: UrlSegment[], posParams?: {[name: string]: UrlSegment}; |
vicb
reviewed
Nov 9, 2016
| * @experimental | ||
| */ | ||
| export type UrlMatchResult = { | ||
| consumed: UrlSegment[], posParams?: {[name: string]: UrlSegment}; |
There was a problem hiding this comment.
consumedSegments to be consistent with previous file ?
vicb
reviewed
Nov 9, 2016
| * | ||
| * @description | ||
| * | ||
| * A custom URL matcher can be provided when a combination of `path` and `pathMatch` isn't |
vicb
reviewed
Nov 9, 2016
| * | ||
| * ``` | ||
| * function htmlFiles(url: UrlSegment[]) { | ||
| * return url.length === 1 && url[0].path.endsWith('.html') ? ({consuemd: url}) : null; |
vicb
reviewed
Nov 9, 2016
| const parts = path.split('/'); | ||
| const posParameters: {[key: string]: any} = {}; | ||
| const consumedSegments: UrlSegment[] = []; | ||
| const matcher = route.matcher ? route.matcher : defaultUrlMatcher; |
vicb
added
action: cleanup
vsavkin
force-pushed
the
router_loosen_up_matching
branch
from
028e889 to
cf56501
Compare
vsavkin
added
action: merge
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Two Changes
Relax Matching
Previously having this configuration
the following url would not match '/parent'. You would have to create a bogus empty-path route, so the configuration looks like this:
Now it is no longer required.
Custom Matching
We are adding support for doing custom url matching.