Skip to content
GitLab
Commit 6b67a836 authored by fat's avatar fat
Browse files

Merge branch '2.2.3' into 2.3.0-wip

parents c00f29e4 2c9f43f6
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
+1 -1
js/bootstrap-collapse.js
+ 1
- 1
View file @ 6b67a836
...@@ -52,7 +52,7 @@ ...@@ -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('-'))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment