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