mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
fixes #13157 - Collapse plugin - issues with transition end event bubbling
This commit is contained in:
parent
9c4afc5772
commit
b9ae07d84a
@ -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])
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user