diff options
| author | fat <[email protected]> | 2014-03-24 21:25:16 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-04-21 17:35:29 -0700 |
| commit | b9ae07d84a79b1a138e3e6068b0cdbdce9041e58 (patch) | |
| tree | 22e23bc85c83abc15d252dbc451326ecbd2870e8 | |
| parent | 9c4afc577253ada54d3ff27965e380a5c9f4e60e (diff) | |
| download | bootstrap-b9ae07d84a79b1a138e3e6068b0cdbdce9041e58.tar.xz bootstrap-b9ae07d84a79b1a138e3e6068b0cdbdce9041e58.zip | |
fixes #13157 - Collapse plugin - issues with transition end event bubbling
| -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]) } |