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

[BUGFIX release] Fix NoneLocation#getURL #13781

Merged
merged 1 commit into from
Jul 6, 2016

Conversation

wagenet
Copy link
Member

@wagenet wagenet commented Jul 2, 2016

Prior fixes to NoneLocation#getURL broke the case where the rootURL
matched the start of the main URL. Resolve that case by checking for
a subsequent forward slash or end of string.

@rwjblue
Copy link
Member

rwjblue commented Jul 2, 2016

This looks good, but based on the changes added in #13520, it seems that history location would have the same issue.

@wagenet - Would you mind updating history also?

Prior fixes to NoneLocation and HistoryLocation's getURL broke the
case where the rootURL or baseURL matched the start of the main URL.
Resolve that case by checking for a subsequent forward slash or end
of string.
@wagenet wagenet force-pushed the fix-none-root-url branch from 8d88f11 to fe473a2 Compare July 6, 2016 16:25
@wagenet
Copy link
Member Author

wagenet commented Jul 6, 2016

@rwjblue should be good to go!

@rwjblue rwjblue merged commit 7d52c53 into emberjs:release Jul 6, 2016
@rwjblue
Copy link
Member

rwjblue commented Jul 6, 2016

Thank you!

@wagenet wagenet deleted the fix-none-root-url branch July 6, 2016 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants