This repository was archived by the owner on Apr 12, 2024. It is now read-only.
fix($animateCss): respect transition styles already on the element #13333
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
| @@ -1855,7 +1901,7 @@ describe("ngAnimate $animateCss", function() { | |||
|
|
|||
| var style = element.attr('style'); | |||
| expect(style).toContain('3000s'); | |||
| expect(style).toContain('linear'); | |||
| expect(style).toContain('ease'); | |||
Narretz
force-pushed
the
fix-animateCss-12656
branch
from
01fe1bc to
8a69ab0
Compare
| @@ -226,6 +226,7 @@ var DETECT_CSS_PROPERTIES = { | |||
| transitionDuration: TRANSITION_DURATION_PROP, | |||
| transitionDelay: TRANSITION_DELAY_PROP, | |||
| transitionProperty: TRANSITION_PROP + PROPERTY_KEY, | |||
| transitionTimingFunction: TRANSITION_PROP + TIMING_KEY, | |||
There was a problem hiding this comment.
See what you did ? Now you have to indent all of them 😄
|
This looks good, we just need to check the |
|
Please also squash both commits together since the first one fails without the second one. |
|
Excellent work! |
Narretz
force-pushed
the
fix-animateCss-12656
branch
from
8a69ab0 to
2cf71b0
Compare
|
Thanks for the review!
|
matsko
pushed a commit
to matsko/angular.js
that referenced
this pull request
Dec 9, 2015
Previously, $animateCss wouldn't use transition styles that were on the element before the animation process started. Precisely, transition property, timing-function and delay were overwritten in the process. Closes angular#12656 Closes angular#13333
|
Reopening to check what travis says. |
Narretz
force-pushed
the
fix-animateCss-12656
branch
from
2cf71b0 to
b7b06d8
Compare
Narretz
added a commit
to Narretz/angular.js
that referenced
this pull request
Dec 10, 2015
Previously, $animateCss wouldn't use transition styles that were on the element before the animation process started. Precisely, transition property, timing-function and delay were overwritten in the process. Closes angular#12656 Closes angular#13333
Narretz
added a commit
to Narretz/angular.js
that referenced
this pull request
Dec 17, 2015
Previously, $animateCss wouldn't use transition styles that were on the element before the animation process started. Precisely, transition property, timing-function and delay were overwritten in the process. Closes angular#12656 Closes angular#13333
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.
Previously, $animateCss wouldn't use transition styles that were on the element
before the animation process started. Precisely, transition property, timing-function
and delay were overwritten in the process.
This is a fix for #12656
It's a bit of a special case, because all the transition properties are sitting on the element already before $animateCss is called.
This could also affect the animation property, I haven't checked yet.
Strangely enough, this fix doesn't work when the transition property is
all, because for some reason $animateCss blocks transition duration etc. when it's all - see https://github.com/angular/angular.js/blob/master/src/ngAnimate/animateCss.js#L596 Removing this doesn't break any tests, though.