diff options
| author | Chris Rebert <[email protected]> | 2014-04-15 21:38:45 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-04-15 21:38:45 -0700 |
| commit | d08f7dd80711f6096f9d2f413ed2933f9d6dd2bf (patch) | |
| tree | 82fa6005813177141fc024e2415ea64af0b38a01 | |
| parent | 1254c322fa77edbd87a33ed30dc5904bdbb91a51 (diff) | |
| parent | 82b066f0a91b6ff0fb5e49b43382dd44d0f35134 (diff) | |
| download | bootstrap-d08f7dd80711f6096f9d2f413ed2933f9d6dd2bf.tar.xz bootstrap-d08f7dd80711f6096f9d2f413ed2933f9d6dd2bf.zip | |
Merge pull request #13330 from Kronuz/patch-1
Wait for the expected target during a collapse
| -rw-r--r-- | js/collapse.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/js/collapse.js b/js/collapse.js index 6f2205b6f..42563c08e 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -56,7 +56,11 @@ this.transitioning = 1 var complete = function (e) { - if (e && e.target != this.$element[0]) return + if (e && e.target != this.$element[0]) { + this.$element + .one($.support.transition.end, $.proxy(complete, this)) + return + } this.$element .removeClass('collapsing') .addClass('collapse in')[dimension]('auto') @@ -92,7 +96,11 @@ this.transitioning = 1 var complete = function (e) { - if (e && e.target != this.$element[0]) return + if (e && e.target != this.$element[0]) { + this.$element + .one($.support.transition.end, $.proxy(complete, this)) + return + } this.transitioning = 0 this.$element .trigger('hidden.bs.collapse') |