Skip to content
This repository has been archived by the owner on May 29, 2019. It is now read-only.

Commit

Permalink
fix(collapse): trigger digest after
Browse files Browse the repository at this point in the history
Fixes #4647
Fixes #4628
Fixes #4561
Closes #4651
  • Loading branch information
Foxandxss committed Oct 18, 2015
1 parent 7985a46 commit 3144633
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/collapse/collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ angular.module('ui.bootstrap.collapse', [])
addClass: 'in',
easing: 'ease',
to: { height: element[0].scrollHeight + 'px' }
}).start().done(expandDone);
}).start().finally(expandDone);
} else {
$animate.addClass(element, 'in', {
to: { height: element[0].scrollHeight + 'px' }
Expand Down Expand Up @@ -50,7 +50,7 @@ angular.module('ui.bootstrap.collapse', [])
$animateCss(element, {
removeClass: 'in',
to: {height: '0'}
}).start().done(collapseDone);
}).start().finally(collapseDone);
} else {
$animate.removeClass(element, 'in', {
to: {height: '0'}
Expand Down

2 comments on commit 3144633

@Skakruk
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fix has broken collapse animation, because finally is triggered before animation ends.

@Foxandxss
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really? Can you open an issue with a plunker please?

Please sign in to comment.