Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't fire show event if show is prevented because other element is tran... #14845

Closed
wants to merge 2 commits into from
Closed

Don't fire show event if show is prevented because other element is tran... #14845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8922c8
Don't fire show event if show is prevented because other element is t…
hnrch02 Oct 22, 2014
4fb36ba
Add unit test
hnrch02 Oct 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions js/collapse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,21 @@
Collapse.prototype.show = function () {
if (this.transitioning || this.$element.hasClass('in')) return

var activesData
var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing')

if (actives && actives.length) {
activesData = actives.data('bs.collapse')
if (activesData && activesData.transitioning) return
}

var startEvent = $.Event('show.bs.collapse')
this.$element.trigger(startEvent)
if (startEvent.isDefaultPrevented()) return

var actives = this.$parent && this.$parent.find('> .panel').children('.in, .collapsing')

if (actives && actives.length) {
var hasData = actives.data('bs.collapse')
if (hasData && hasData.transitioning) return
Plugin.call(actives, 'hide')
hasData || actives.data('bs.collapse', null)
activesData || actives.data('bs.collapse', null)
}

var dimension = this.dimension()
Expand Down
35 changes: 35 additions & 0 deletions js/tests/unit/collapse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,4 +263,39 @@ $(function () {
$target3.click()
})

test('should not fire show event if show is prevented because other element is still transitioning', function () {
stop()

var accordionHTML = '<div id="accordion">'
+ '<div class="panel"/>'
+ '<div class="panel"/>'
+ '</div>'
var showFired = false
var $groups = $(accordionHTML).appendTo('#qunit-fixture').find('.panel')

var $target1 = $('<a data-toggle="collapse" href="#body1" data-parent="#accordion"/>').appendTo($groups.eq(0))

$('<div id="body1" class="collapse"/>')
.appendTo($groups.eq(0))
.on('show.bs.collapse', function () {
showFired = true
})

var $target2 = $('<a data-toggle="collapse" href="#body2" data-parent="#accordion"/>').appendTo($groups.eq(1))
var $body2 = $('<div id="body2" class="collapse"/>').appendTo($groups.eq(1))

$target2.click()

$body2
.toggleClass('in collapsing')
.data('bs.collapse').transitioning = 1

$target1.click()

setTimeout(function () {
ok(!showFired, 'show event didn\'t fire')
start()
}, 1)
})

})