diff options
| author | Mark Otto <otto@github.com> | 2012-12-21 01:47:36 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2012-12-21 01:47:36 +0400 |
| commit | a5e04c0799b64421f413321c29455e93187ad35a (patch) | |
| tree | 44d69a1f19000ae4e8156ffc5b73dc843d244975 /js/bootstrap-collapse.js | |
| parent | 00ff34b9e6671d9363ce5cb1d11aaa6bd45e995a (diff) | |
| parent | 5e4f663e699d6c03cf6c778d39ecac6cb949e285 (diff) | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/templates/pages/base-css.mustache
less/dropdowns.less
less/forms.less
Diffstat (limited to 'js/bootstrap-collapse.js')
| -rw-r--r-- | js/bootstrap-collapse.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 5efdcb1f63..48dea44c48 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -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('-')) |