Commit 022dc308 authored by Mark Otto's avatar Mark Otto

Merge pull request #13176 from twbs/fat-13157

fixes #13157 - Collapse plugin - issues with transition end event bubbli...
parents fe11ac77 b9ae07d8
...@@ -65,7 +65,9 @@ ...@@ -65,7 +65,9 @@
.removeClass('collapsing') .removeClass('collapsing')
.addClass('collapse in')[dimension]('') .addClass('collapse in')[dimension]('')
this.transitioning = 0 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) if (!$.support.transition) return complete.call(this)
...@@ -73,7 +75,7 @@ ...@@ -73,7 +75,7 @@
var scrollSize = $.camelCase(['scroll', dimension].join('-')) var scrollSize = $.camelCase(['scroll', dimension].join('-'))
this.$element 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]) .emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize])
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment