diff options
| author | Jacob Thornton <[email protected]> | 2012-04-15 16:15:32 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-15 16:15:32 -0700 |
| commit | 0b8042656fc52600e18fb1c7f54dbbe8a284e737 (patch) | |
| tree | 65b4da74c6eac862705f1e817d839e29deba52e3 /js/bootstrap-collapse.js | |
| parent | 13e4d1d5ac90484c09ecb1a98e540309d043a6f7 (diff) | |
| download | bootstrap-0b8042656fc52600e18fb1c7f54dbbe8a284e737.tar.xz bootstrap-0b8042656fc52600e18fb1c7f54dbbe8a284e737.zip | |
fixes #2941 + whitespace in collapse
Diffstat (limited to 'js/bootstrap-collapse.js')
| -rw-r--r-- | js/bootstrap-collapse.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 30e139cf8..41e097df3 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -60,6 +60,7 @@ if (actives && actives.length) { hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return actives.collapse('hide') hasData || actives.data('collapse', null) } |