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 beta] Ensure substates properly work with resetNamespace #14054

Merged
merged 1 commit into from
Aug 12, 2016

Conversation

trentmwillis
Copy link
Member

This fixes two apparent issues with substates. The first was discovered when enabling substates for the mount keyword, but while fixing that a second seems to have been uncovered.

When looking up substates, the findChildRouteName method was always applying the parent route's namespace, even if the current route had resetNamespace applied. Some of the tests even seemed to be explicitly working around this issue (such as here and here), so maybe this was intended, but per the discussion in the other thread, it seems like no one currently expects it.

Additionally, _loading substates were having resetNamespace applied, but _error ones were not. This leads to inconsistent and unintuitive behavior. Again, maybe intended, but seems wrong.

@rwjblue
Copy link
Member

rwjblue commented Aug 12, 2016

This should target beta branch, can you prefix with [BUGFIX beta]?

@trentmwillis trentmwillis changed the title Ensure substates properly work with resetNamespace [BUGFIX beta] Ensure substates properly work with resetNamespace Aug 12, 2016
@trentmwillis
Copy link
Member Author

@rwjblue updated.

@rwjblue rwjblue merged commit caa9d3f into emberjs:master Aug 12, 2016
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