This repository has been archived by the owner on May 29, 2019. It is now read-only.
refactor(modal): use ngAnimate for animation #2724
Merged
Conversation
This file contains 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
3 tasks
This was referenced Oct 6, 2014
|
This would be very cool thing! Can't wait! |
|
|
||
| domEl.bind(transitionEndEventName, function () { | ||
| $timeout.cancel(timeout); | ||
| domEl.on('$animate:close', function closeFn() { | ||
| afterAnimating(); |
There was a problem hiding this comment.
May want to do this via scope.$evalAsync .
chrisirhc
force-pushed
the
feature/animate-modal-2
branch
2 times, most recently
from
957ceab
to
cd30758
Compare
|
This code is ready to merge. It's just blocked on #2699 as the carousel is broken after adding ngAnimate. |
|
Can we get this merged? |
|
I'd like to see it merged as well. :) |
|
@chrisirhc - it can no longer merge automatically. |
chrisirhc
force-pushed
the
feature/animate-modal-2
branch
from
cd30758
to
5d85752
Compare
|
Rebased. Now if anyone can take a look, I'll merge this. |
| $timeout.cancel(timeout); | ||
| afterAnimating(); | ||
| scope.$apply(); | ||
| // TODO: use .one when upgrading to >= 1.2.21 |
There was a problem hiding this comment.
We could version sniff (angular.version.major, angular.version.minor, and angular.version.dot) here to handle the differences properly - thoughts?
There was a problem hiding this comment.
Ah, since we're requiring 1.3 after this release, .one is already usable. I'll remove this and use .one.
|
Other than that one minor comment (may be a non-issue), this PR LGTM. |
chrisirhc
force-pushed
the
feature/animate-modal-2
branch
from
5d85752
to
833fffa
Compare
chrisirhc
added a commit
to chrisirhc/angular-ui-bootstrap
that referenced
this pull request
Mar 23, 2015
- Fix scope.$apply call not working previously because scope was already destroyed. Use $rootScope instead. - Move $destroy call nearer to the dom removal. - Remove fallback timer (emulateTime param) Fixes angular-ui#2585 Fixes angular-ui#2674 Fixes angular-ui#2536 Fixes angular-ui#2790 Fixes angular-ui#3182 Closes angular-ui#2724
chrisirhc
force-pushed
the
feature/animate-modal-2
branch
from
833fffa
to
0d8820b
Compare
- Fix scope.$apply call not working previously because scope was already destroyed. Use $rootScope instead. - Move $destroy call nearer to the dom removal. - Remove fallback timer (emulateTime param) Fixes angular-ui#2585 Fixes angular-ui#2674 Fixes angular-ui#2536 Fixes angular-ui#2790 Fixes angular-ui#3182 Closes angular-ui#2724
Closed
ayakovlevgh
pushed a commit
to ayakovlevgh/bootstrap
that referenced
this pull request
Mar 24, 2015
- Fix scope.$apply call not working previously because scope was already destroyed. Use $rootScope instead. - Move $destroy call nearer to the dom removal. - Remove fallback timer (emulateTime param) Fixes angular-ui#2585 Fixes angular-ui#2674 Fixes angular-ui#2536 Fixes angular-ui#2790 Fixes angular-ui#3182 Closes angular-ui#2724
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.
Supercedes #1772
This makes use of the new
$animate:closeevent to determine that the animation is done instead of using$transition. There are minimal changes to the current code and there's one fix and the removal of some timers.