diff options
| author | Mark Otto <[email protected]> | 2014-03-08 20:10:04 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-08 20:10:04 -0800 |
| commit | e4d13e238d0d6ea241f4e77328f6551206d17362 (patch) | |
| tree | e51676af51977812cd4ce68fcffc349739a24e9a /js | |
| parent | 90eb52495b12149b7ed2d1301c7c9cf5990cca85 (diff) | |
| parent | b8ab0c66accc28fb909bba54a0d09fa190ac20cf (diff) | |
| download | bootstrap-e4d13e238d0d6ea241f4e77328f6551206d17362.tar.xz bootstrap-e4d13e238d0d6ea241f4e77328f6551206d17362.zip | |
Merge pull request #12983 from twbs/fat-9836
fixes #9836
Diffstat (limited to 'js')
| -rw-r--r-- | js/collapse.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/collapse.js b/js/collapse.js index 6907dda3a..59e27f13d 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -56,7 +56,8 @@ this.transitioning = 1 - var complete = function () { + var complete = function (e) { + if (e && e.target != this.$element[0]) return this.$element .removeClass('collapsing') .addClass('collapse in') @@ -95,7 +96,8 @@ this.transitioning = 1 - var complete = function () { + var complete = function (e) { + if (e && e.target != this.$element[0]) return this.transitioning = 0 this.$element .trigger('hidden.bs.collapse') |