mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00
Code Activity

Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

Browse Source
This commit is contained in:
Mark Otto
2012-04-15 16:48:26 -07:00
parent d374fe92e5 0b8042656f
commit b67a2d8a59
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/js/bootstrap-collapse.js
Vendored
+1
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)
} }
js/bootstrap-collapse.js
Vendored
+1
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)
} }