diff options
| author | fat <[email protected]> | 2014-03-08 19:45:38 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2014-03-08 19:45:38 -0800 |
| commit | 4d96e69a55a7d5c964d672fe2cf8f89c057bcb57 (patch) | |
| tree | 55392236f4be97fc8f39ee9e963b43947c1f84a0 /dist/js/bootstrap.js | |
| parent | 90eb52495b12149b7ed2d1301c7c9cf5990cca85 (diff) | |
| download | bootstrap-4d96e69a55a7d5c964d672fe2cf8f89c057bcb57.tar.xz bootstrap-4d96e69a55a7d5c964d672fe2cf8f89c057bcb57.zip | |
fixes #9836
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 4e206818a..10ce289be 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -516,7 +516,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re 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') @@ -555,7 +556,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re 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') |