This repository was archived by the owner on Apr 12, 2024. It is now read-only.
fix(ngAnimate): run structural animations with cancelled out class ch… #14259
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
Narretz
force-pushed
the
fix-animate-cancel-enter
branch
from
7b05078 to
c2b97c4
Compare
| @@ -1198,6 +1200,28 @@ describe("animations", function() { | |||
|
|
|||
| expect(capturedAnimation[2].addClass).toBe('blue'); | |||
| })); | |||
|
|
|||
| it('should NOT cancel a previously joined addClass+structural animation if a follow-up removeClass animation is using the same class value (pre-digest)', | |||
Narretz
force-pushed
the
fix-animate-cancel-enter
branch
from
8176ff2 to
a3fa069
Compare
|
@gkalpak can you take another look at this? |
| @@ -1198,6 +1200,29 @@ describe("animations", function() { | |||
|
|
|||
| expect(capturedAnimation[2].addClass).toBe('blue'); | |||
| })); | |||
|
|
|||
| it('should NOT cancel a previously joined addClass+structural animation if a follow-up' + | |||
There was a problem hiding this comment.
Missing whitespace after follow-up.
|
Other than the minor comments (whitespaces and unused var?), it LGTM 👍 |
…anges When multiple animations on the same element are queued before a $digest passes, the animator tries to create as few actual animations as possible by joining / canceling redundant animations. Class-based animations for example are cancelled when the classes that are added and removed are the same, and the result is no class-change. This however must only happen if there's no structural animation currently queued. Fixes angular#14249
Narretz
force-pushed
the
fix-animate-cancel-enter
branch
from
a3fa069 to
f3c0af7
Compare
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.
What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Bugfix
Does this PR introduce a breaking change?
No
Please check if the PR fulfills these requirements
Other information:
…anges
When multiple animations on the same element are queued before a $digest passes,
the animator tries to create as few actual animations as possible by joining / canceling
redundant animations. Class-based animations for example are cancelled when the classes that
are added and removed are the same, and the result is no class-change. This however must only
happen if there's no structural animation currently queued.
Fixes #14249