rebased against upstream/master #1352
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`$stateParams` is now a service with an `$observe()` method to watch parameters on dynamic state parameters. Dynamic state parameters can be declared like so: `params: { foo: { dynamic: true } }`.
Closes angular-ui#1037, angular-ui#1038, angular-ui#64
Refactor $stateParams to be built by factory, so internal params and watchers can be localized.
…lar-ui#702 Signed-off-by: Nate Abele <nate.abele@gmail.com>
…p, and flattenPrototypeChain
The basic building block for the new resolve system. Resolvables encapsulate a state's resolve's resolveFn, the resolveFn's declared dependencies, and the wrapped (.promise) and unwrapped-when-complete (.data) result of the resolveFn. An element in a state path which represents a state and that state's Resolvables and their resolve statuses. Holds an ordered list of PathElements, is used to transfer resolve status by creating derivative Paths passed into ResolveContexts. Manages a set of Resolvables that are available at each level of the Path. Provides access to the inherited Resolvables for a given state.
feat($resolve): Super-duper-lazy Resolvable system merge PR from resolvable-rebase
`$stateParams` is now a service with an `$observe()` method to watch parameters on dynamic state parameters. Dynamic state parameters can be declared like so: `params: { foo: { dynamic: true } }`.
Closes angular-ui#1037, angular-ui#1038, angular-ui#64
Refactor $stateParams to be built by factory, so internal params and watchers can be localized.
…p, and flattenPrototypeChain
The basic building block for the new resolve system. Resolvables encapsulate a state's resolve's resolveFn, the resolveFn's declared dependencies, and the wrapped (.promise) and unwrapped-when-complete (.data) result of the resolveFn. An element in a state path which represents a state and that state's Resolvables and their resolve statuses. Holds an ordered list of PathElements, is used to transfer resolve status by creating derivative Paths passed into ResolveContexts. Manages a set of Resolvables that are available at each level of the Path. Provides access to the inherited Resolvables for a given state.
|
damnit, it always picks the wrong project. I'll try again. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hey look, it merges!
I think I did this right, but I'm not sure. At least the button is green.
newtoupstream-rebaseand rebased against upstream/master. I addressed a few merge conflicts. That's what's in Question for AngularJS Core Team #7 which doesn't merge properly.newtonew-rebasedand merged in the changes fromupstream-rebase.newcan be merged intoupstream/mastercleanly.@nateabele If this seems right, push the button