Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix collapse animation
Set class 'in' at the end of the animation to mimick the
behaviour of TWBS js. This removes scrollbars which are
otherwise visible during the animation in certain
configurations (most notably when used inside navbars).
  • Loading branch information
inukshuk committed Sep 30, 2015
commit d307a1afae5969d1052b352b04ab61a03261b88d
14 changes: 6 additions & 8 deletions src/collapse/collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,19 @@ angular.module('ui.bootstrap.collapse', [])

if ($animateCss) {
$animateCss(element, {
addClass: 'in',
easing: 'ease',
to: { height: element[0].scrollHeight + 'px' }
}).start().done(expandDone);
} else {
$animate.addClass(element, 'in', {
to: { height: element[0].scrollHeight + 'px' }
$animate.animate(element, {}, {
height: element[0].scrollHeight + 'px'
}).then(expandDone);
}
}

function expandDone() {
element.removeClass('collapsing')
.addClass('collapse')
.addClass('collapse in')
.css({height: 'auto'});
}

Expand All @@ -41,19 +40,18 @@ angular.module('ui.bootstrap.collapse', [])
.css({height: element[0].scrollHeight + 'px'})
// initially all panel collapse have the collapse class, this removal
// prevents the animation from jumping to collapsed state
.removeClass('collapse')
.removeClass('collapse in')
.addClass('collapsing')
.attr('aria-expanded', false)
.attr('aria-hidden', true);

if ($animateCss) {
$animateCss(element, {
removeClass: 'in',
to: {height: '0'}
}).start().done(collapseDone);
} else {
$animate.removeClass(element, 'in', {
to: {height: '0'}
$animate.animate(element, {}, {
height: '0'
}).then(collapseDone);
}
}
Expand Down