`), the attribute `role="button"` should be added to the element.
diff --git a/js/src/collapse.js b/js/src/collapse.js
index f4d140f27..eaad1be54 100644
--- a/js/src/collapse.js
+++ b/js/src/collapse.js
@@ -130,7 +130,11 @@ const Collapse = (($) => {
let activesData
if (this._parent) {
- actives = $.makeArray($(this._parent).children().children(Selector.ACTIVES))
+ actives = $.makeArray(
+ $(this._parent)
+ .find(Selector.ACTIVES)
+ .filter(`[data-parent="${this._config.parent}"]`)
+ )
if (!actives.length) {
actives = null
}
diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index f20c0809c..337ec647b 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -516,12 +516,50 @@ $(function () {
var done = assert.async()
var accordionHTML = '
'
+ '
'
- + '
'
- + '
'
+ + '
'
+ + '
'
+ '
'
+ '
'
- + '
'
- + '
'
+ + '
'
+ + '
'
+ + '
'
+ + '
'
+
+ $(accordionHTML).appendTo('#qunit-fixture')
+ var $trigger = $('#linkTrigger')
+ var $triggerTwo = $('#linkTriggerTwo')
+ var $collapseOne = $('#collapseOne')
+ var $collapseTwo = $('#collapseTwo')
+ $collapseOne.on('shown.bs.collapse', function () {
+ assert.ok($collapseOne.hasClass('show'), '#collapseOne is shown')
+ assert.ok(!$collapseTwo.hasClass('show'), '#collapseTwo is not shown')
+ $collapseTwo.on('shown.bs.collapse', function () {
+ assert.ok(!$collapseOne.hasClass('show'), '#collapseOne is not shown')
+ assert.ok($collapseTwo.hasClass('show'), '#collapseTwo is shown')
+ done()
+ })
+ $triggerTwo.trigger($.Event('click'))
+ })
+ $trigger.trigger($.Event('click'))
+ })
+
+ QUnit.test('should allow accordion to contain nested elements', function (assert) {
+ assert.expect(4)
+ var done = assert.async()
+ var accordionHTML = '
'
@@ -548,20 +586,20 @@ $(function () {
var done = assert.async()
$('
'
+ '
'
- + '
'
- + '
'
+ + '
'
+ + '
'
+ '
'
- + '
'
- + '
'
+ + '
'
+ + '
'
+ '
'
+ '
').appendTo('#qunit-fixture')
var $trigger = $('#linkTrigger')