diff options
| author | Mark Otto <[email protected]> | 2014-04-17 00:56:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-04-17 00:56:22 -0700 |
| commit | 06fb9406bd16ef66e1f8587209a35e231189018e (patch) | |
| tree | d24913963e33bf79d0c659741e58242934bc7a61 /dist/js/bootstrap.js | |
| parent | d08f7dd80711f6096f9d2f413ed2933f9d6dd2bf (diff) | |
| download | bootstrap-06fb9406bd16ef66e1f8587209a35e231189018e.tar.xz bootstrap-06fb9406bd16ef66e1f8587209a35e231189018e.zip | |
grunt dist
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 0cc5c8ca6..40aaf9f35 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -516,7 +516,11 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re 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') @@ -552,7 +556,11 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re 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') |