diff options
| author | Mark Otto <[email protected]> | 2014-04-24 18:59:21 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-04-24 18:59:21 -0700 |
| commit | 022dc30891dd435fb15a69a0830a92fd40c11b12 (patch) | |
| tree | 6755604a5c9ff456339ddeb45252718d0ca2bd61 | |
| parent | fe11ac77a26ab321bb6648d557a15416bab1d74e (diff) | |
| parent | b9ae07d84a79b1a138e3e6068b0cdbdce9041e58 (diff) | |
| download | bootstrap-022dc30891dd435fb15a69a0830a92fd40c11b12.tar.xz bootstrap-022dc30891dd435fb15a69a0830a92fd40c11b12.zip | |
Merge pull request #13176 from twbs/fat-13157
fixes #13157 - Collapse plugin - issues with transition end event bubbli...
| -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 266f3580d..49abbe515 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -65,7 +65,9 @@ .removeClass('collapsing') .addClass('collapse in')[dimension]('') this.transitioning = 0 - this.$element.trigger('shown.bs.collapse') + this.$element + .off($.support.transition.end + '.bs.collapse') + .trigger('shown.bs.collapse') } if (!$.support.transition) return complete.call(this) @@ -73,7 +75,7 @@ var scrollSize = $.camelCase(['scroll', dimension].join('-')) this.$element - .one($.support.transition.end, $.proxy(complete, this)) + .on($.support.transition.end + '.bs.collapse', $.proxy(complete, this)) .emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize]) } |