This repository was archived by the owner on Apr 12, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 27.4k
Updates branch with master #11955
Merged
jesselpalmer
merged 23 commits into
angular:materialize
from
jesselpalmer:updates-branch-with-master
May 28, 2015
Merged
Updates branch with master #11955
jesselpalmer
merged 23 commits into
angular:materialize
from
jesselpalmer:updates-branch-with-master
May 28, 2015
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
…t correct time Due to a mismatch of where the `options.domOperation` value was stored, the element involved in the `leave` animation for an anchored animation session was not removed as soon as the leave animation ended. This resulted in a pending element persisting within the DOM until all animations involved in the associated anchor animation were complete. This patch fixes this issue. Closes #11850
…hods As of bf0f550 (released in 1.3.0) it is no longer valid to pass a callback to the following functions: `enter`, `move`, `leave`, `addClass`, `removeClass`, `setClass` and `animate`. To prevent confusing error messages, this change asserts that this parameter is not a function. Closes #11826 Closes #11713
…ethods Update $http's createShortMethods and createShortMethodsWithData to extend an empty object instead of the passed-in config. Previously, since $http was extending the passed-in config, the changes to the config object persisted even after the call to $http's get/post/etc. returned. This causes unexpected behavior if that config object is reused in subsequent calls to $http. The existing test in httpSpec was not properly testing this situation. Closes: #11764
Prior to this fix the $animate.enter() and $animate.move() events caused an error when a parent or after element was provided that was not already wrapped as a jqLite element. This patch ensures that both wrapped and unwrapped DOM nodes are allowed. Closes #11848
…to null property If a select directive was bound, using ng-model, to a property with a value of null this would result in an unknown option being added to the select element with the value "? object:null ?". This change prevents a null value from adding an unknown option meaning that the extra option is not added as a child of the select element. Since select (without ngOptions) can only have string value options then `null` was never a viable option value, so this is not a breaking change. Closes #11872 Closes #11875
…erly cleaned up Prior to this fix if the same CSS class was added and removed quickly then the element being animated would be left with a stale cache of the cancelled out animation. This would then result in follow-up animations being added to the previous animation which would then never run. A stale cache was to blame for that. This patch takes care of this issue. Closes #11652
…st function Prior to this fix if `$animate.enter()` or `$animate.leave()` was called before a digest was issued then the element may not be cancelled early enough. This fix ensures that the previous structural animation is cancelled immediately when a follow-up animation is kicked off. Closes #11867
…ass CSS classes on the element With the abstraction system that ngAnimate uses, $animateCss internally sets the provided `event` as a CSS class on the element. In this situation the `addClass` and `removeClass` events on the element as a CSS class. This should not happen with class-based animations and this feature is unnecessary and has now been removed. Closes #11810
…ith a RAF Prior to this fix any nested class-based animations (animations that are triggered with addClass/removeClass or ngClass) would cancel each other out when nested in DOM structure. This fix ensures that the nested animations are spaced out with sequenced RAFs so that parent CSS classes are applied prior to any ancestor animations that are scheduled to run. Closes #11812
…mate methods This reverts commit 9bb4d6c.
Prior to this fix there was another patch that threw an exception if the provided options value was not of an object type. While this is correct in terms of logic, it caused issues with plugins and tools that are designed to work with multiple version of Angular. This fix ensures that these plugins work since an invalid options value is ignored by `$animate`. Closes #11826
…class is added/removed when removed/added This patch ensures that if the same CSS class is added/removed within a follow-up digest then the previous class-based animation is cancelled beforehand. Closes #11717
We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm. |
jesselpalmer
added a commit
that referenced
this pull request
May 28, 2015
Updates branch with master
ggershoni
pushed a commit
to ggershoni/angular.js
that referenced
this pull request
Sep 29, 2015
…h-master Updates branch with master
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.