mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-20 17:54:23 +01:00
Merge branch '2.2.3' into 2.3.0-wip
This commit is contained in:
commit
6b67a83631
2
js/bootstrap-collapse.js
vendored
2
js/bootstrap-collapse.js
vendored
@ -52,7 +52,7 @@
|
||||
, actives
|
||||
, hasData
|
||||
|
||||
if (this.transitioning) return
|
||||
if (this.transitioning || this.$element.hasClass('in')) return
|
||||
|
||||
dimension = this.dimension()
|
||||
scroll = $.camelCase(['scroll', dimension].join('-'))
|
||||
|
Loading…
x
Reference in New Issue
Block a user