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

Merge pull request #13176 from twbs/fat-13157

fixes #13157 - Collapse plugin - issues with transition end event bubbli...
parents fe11ac77 b9ae07d8
4 merge requests!28721Hot test,!16605Test pull please ignore,!22103test,!25326Adjust examples
Showing with 4 additions and 2 deletions
+4 -2
......@@ -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])
}
......
Supports Markdown
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