Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(progress-bar): incorrectly handling current path when using hash location strategy #12713

Merged
merged 1 commit into from
Aug 22, 2018

Conversation

crisbeto
Copy link
Member

@crisbeto crisbeto commented Aug 17, 2018

Fixes the progress bar prefixing the references incorrectly when the consumer is using the router's hash location strategy. The issue comes from the fact that the Location normalizes the location.pathname between the regular strategy and the hash one, whereas we need to use the exact same path as the window.location.

Fixes #12710.

@crisbeto crisbeto added P2 The issue is important to a large percentage of users, with a workaround target: patch This PR is targeted for the next patch release labels Aug 17, 2018
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Aug 17, 2018
this._rectangleFillValue = `url('${location ? location.path() : ''}#${this.progressbarId}')`;
// because named route URLs can contain parentheses (see #12338). Also we don't use
// `Location` from `@angular/common`, because we can't tell the difference between whether
// the consumer is using the hash location strategy or not.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't you do the same thing with location.path() from @angular/common's Location?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what it used to do, but AFAIK Angular's location.path will normalize both of these to the same value: /#/foo/bar and /foo/bar.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, got it. Can you expand the comment with that?

...the consumer is using the hash location strategy or not because it normalizes both
`/#/foo/bar` and `/foo/bar` to the same thing

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

…location strategy

Fixes the progress bar prefixing the references incorrectly when the consumer is using the router's hash location strategy. The issue comes from the fact that the router normalizes the `location.pathname` between the regular strategy and the hash one, whereas we need to use the exact same path as the `window.location`.

Fixes angular#12710.
@crisbeto crisbeto force-pushed the 12710/progress-bar-hash branch from 62b7288 to a3f5206 Compare August 21, 2018 16:37
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker labels Aug 21, 2018
@ngbot
Copy link

ngbot bot commented Aug 21, 2018

I see that you just added the pr: merge ready label, but the following checks are still failing:
    failure status "continuous-integration/travis-ci/pr" is failing

If you want your PR to be merged, it has to pass all the CI checks.

If you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help.

@jelbourn jelbourn merged commit 5727eac into angular:master Aug 22, 2018
jelbourn pushed a commit that referenced this pull request Aug 29, 2018
…location strategy (#12713)

Fixes the progress bar prefixing the references incorrectly when the consumer is using the router's hash location strategy. The issue comes from the fact that the router normalizes the `location.pathname` between the regular strategy and the hash one, whereas we need to use the exact same path as the `window.location`.

Fixes #12710.
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement P2 The issue is important to a large percentage of users, with a workaround target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MatProgressBar _rectangleFillValue didn't display when routing is using hash
4 participants