mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-05-27 14:46:01 +03:00
revert collapse change + add emulateTransitionEvent to catch dead css transitions
This commit is contained in:
+4
-2
@@ -50,7 +50,7 @@
|
||||
|
||||
var dimension = this.dimension()
|
||||
var scroll = $.camelCase(['scroll', dimension].join('-'))
|
||||
var actives = this.$parent && this.$parent.find('.collapse.in')
|
||||
var actives = this.$parent && this.$parent.find('> .accordion-group > .in')
|
||||
|
||||
if (actives && actives.length) {
|
||||
var hasData = actives.data('bs.collapse')
|
||||
@@ -104,7 +104,9 @@
|
||||
this.$element[method]('in')
|
||||
|
||||
$.support.transition && this.$element.hasClass('collapse') ?
|
||||
this.$element.one($.support.transition.end, complete) :
|
||||
this.$element
|
||||
.one($.support.transition.end, complete)
|
||||
.emulateTransitionEnd(350) :
|
||||
complete()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user