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

Allow resolve params to be injected into controllerProvider #1853

Merged
merged 1 commit into from
Apr 6, 2015

Conversation

tjwallace
Copy link
Contributor

Fixes #1131

@christopherthielen
Copy link
Contributor

Can it be that easy?

@christopherthielen christopherthielen added this to the 0.2.14 milestone Apr 1, 2015
@christopherthielen christopherthielen self-assigned this Apr 1, 2015
@tjwallace
Copy link
Contributor Author

@christopherthielen I guess so... ¯_(ツ)_/¯

@nateabele
Copy link
Contributor

Hah, looks good. Please amend the commit message to follow the contributor guidelines so that this change works correctly with our build system. Other than that, I am 👍 for merging. Thanks for your work.

@tjwallace
Copy link
Contributor Author

@nateabele done in 42e6bf2 - wasn't exactly sure what the scope was for the commit message so I used state based off the file name. Let me know if it can be more specific and I will update.

@nateabele
Copy link
Contributor

Weird, I was gonna amend it to feat($state) & merge it for you, but I can't even figure out how to access that commit hash. GitHub says it's in angular-ui/ui-router, but it won't let me fetch/checkout.

@tjwallace tjwallace force-pushed the resolves_in_controllerProvider branch from 42e6bf2 to b380c22 Compare April 6, 2015 16:36
@tjwallace
Copy link
Contributor Author

@nateabele I did another force push and this time it is showing up properly in the PR - zozi@b380c22

@nateabele
Copy link
Contributor

Nice, thanks.

nateabele added a commit that referenced this pull request Apr 6, 2015
Allow resolve params to be injected into controllerProvider
@nateabele nateabele merged commit 0250291 into angular-ui:master Apr 6, 2015
@tjwallace tjwallace deleted the resolves_in_controllerProvider branch April 6, 2015 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

controllerProvider not $injecting resolve:{} parameters
3 participants