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.

Sign up for GitHub

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

Jump to bottom

fix($resolve): use resolvefn result,not parent resolved value of same name #1360

Merged
merged 1 commit into from
Sep 12, 2014
Merged

fix($resolve): use resolvefn result,not parent resolved value of same name #1360

merged 1 commit into from
Sep 12, 2014

Conversation

christopherthielen
Copy link
Contributor

Made resolve values ignore any keys that we're actively trying to
resolve, when they also exist in some parent state. Made $$resolves
persist so they can be picked up by a child state in a later digest()
fixes #1317
fixes #1353

@christopherthielen
fix($resolve): use resolve fn result, not parent resolved value of sa…
67f5e00 
…me name

Made resolve values ignore any keys that we're actively trying to
resolve, when they also exist in some parent state.  Made $$resolves
persist so they can be picked up by a child state in a later digest()
fixes #1317
fixes #1353
This was referenced Sep 12, 2014
Closed
Closed
christopherthielen added a commit that referenced this pull request Sep 12, 2014
@christopherthielen
Merge pull request #1360 from angular-ui/issue-1317
64b9bea 
fix($resolve): use resolvefn result,not parent resolved value of same name
@christopherthielen christopherthielen merged commit 64b9bea into master Sep 12, 2014
@christopherthielen christopherthielen deleted the issue-1317 branch September 12, 2014 01:50
@christopherthielen christopherthielen added this to the 0.2.12 milestone Sep 26, 2014
@christopherthielen christopherthielen mentioned this pull request Oct 27, 2014
Closed
@christopherthielen christopherthielen mentioned this pull request Jun 23, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.2.12
Development

Successfully merging this pull request may close these issues.

Strange behavior on resolve and $scope inheriting resolvers with the same name over childs
1 participant
@christopherthielen