mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-10 23:54:08 +02:00
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
This commit is contained in:
1
docs/assets/js/bootstrap-collapse.js
vendored
1
docs/assets/js/bootstrap-collapse.js
vendored
@@ -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)
|
||||
}
|
||||
|
1
js/bootstrap-collapse.js
vendored
1
js/bootstrap-collapse.js
vendored
@@ -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)
|
||||
}
|
||||
|
Reference in New Issue
Block a user