This repository was archived by the owner on Apr 12, 2024. It is now read-only.
fix(ngAnimate): let $animate.cancel() reject the runner promise #16373
+266
−12
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
branch
2 times, most recently
from
e781633 to
f799435
Compare
Narretz
force-pushed
the
fix-animate-cancel
branch
6 times, most recently
from
507c139 to
eb63c53
Compare
Closes angular#14204 BREAKING CHANGE: $animate.cancel(runner) now rejects the underlying promise and calls the catch() handler on the runner returned by $animate functions (enter, leave, move, addClass, removeClass, setClass, animate). Previously it would resolve the promise as if the animation had ended successfully. Example: ```js var runner = $animate.addClass('red'); runner.then(function() { console.log('success')}); runner.catch(function() { console.log('cancelled')}); runner.cancel(); ``` Pre-1.7.0, this logs 'success', 1.7.0 and later it logs 'cancelled'. To migrate, add a catch() handler to your animation runners.
Narretz
force-pushed
the
fix-animate-cancel
branch
from
eb63c53 to
671aa92
Compare
Narretz
changed the title
petebacondarwin
approved these changes
Jan 29, 2018
| @@ -934,6 +935,195 @@ describe('animations', function() { | |||
| })); | |||
| }); | |||
|
|
|||
|
|
|||
| describe('$animate.cancel()', function() { | |||
There was a problem hiding this comment.
Isn't it enough to check that runner.cancel is called, since runner.cancel appears to have comprehensive tests of its own?
There was a problem hiding this comment.
Hm, that's right, just the runner tests don't test with actual DOM elements and not with the $animate functions. Your call whether it should be simplified.
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, ...)
fix
What is the current behavior? (You can also link to an open issue here)
See #14204
What is the new behavior (if this is a feature change)?
Does this PR introduce a breaking change?
Yes
Please check if the PR fulfills these requirements
Other information:
There is another aspect to this problem that is not fixed by this PR:
2. Cancelling css animations should immediately abort the animation and set the DOM / css to its final state. This is currently broken in FF and IE11 (at least), see https://bugzilla.mozilla.org/show_bug.cgi?id=1425014. This must be tested with e2e test. Fixing this is not a BC.