diff options
| author | Mark Otto <otto@github.com> | 2013-02-06 10:42:54 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2013-02-06 10:42:54 +0400 |
| commit | 421f9f67c44d4b7c971b42808687ae7b71c99151 (patch) | |
| tree | 4aa1c698f535d8ae8f7aae7a4b6d396bc86906a4 /js/bootstrap-collapse.js | |
| parent | 6d21d8600739fe16e8993a11f82a4727065ca78a (diff) | |
| parent | 3b56227553f40cc567e161c68c64f1e315fd5241 (diff) | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.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 e1d5a856e8..2730a48d45 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -72,7 +72,7 @@ , hide: function () { var dimension - if (this.transitioning) return + if (this.transitioning || !this.$element.hasClass('in')) return dimension = this.dimension() this.reset(this.$element[dimension]()) this.transition('removeClass', $.Event('hide'), 'hidden') |