1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-19 11:51:23 +02:00

fixes #2941 + whitespace in collapse

This commit is contained in:
Jacob Thornton
2012-04-15 16:15:32 -07:00
parent 13e4d1d5ac
commit 0b8042656f
4 changed files with 6 additions and 4 deletions

View File

@@ -60,6 +60,7 @@
if (actives && actives.length) { if (actives && actives.length) {
hasData = actives.data('collapse') hasData = actives.data('collapse')
if (hasData && hasData.transitioning) return
actives.collapse('hide') actives.collapse('hide')
hasData || actives.data('collapse', null) hasData || actives.data('collapse', null)
} }

View File

@@ -60,6 +60,7 @@
if (actives && actives.length) { if (actives && actives.length) {
hasData = actives.data('collapse') hasData = actives.data('collapse')
if (hasData && hasData.transitioning) return
actives.collapse('hide') actives.collapse('hide')
hasData || actives.data('collapse', null) hasData || actives.data('collapse', null)
} }