mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
Detach accordions from .card
This commit is contained in:
parent
95f37e4c40
commit
099486f294
@ -57,7 +57,8 @@ const Collapse = (($) => {
|
||||
|
||||
const Selector = {
|
||||
ACTIVES : '.card > .show, .card > .collapsing',
|
||||
DATA_TOGGLE : '[data-toggle="collapse"]'
|
||||
DATA_TOGGLE : '[data-toggle="collapse"]',
|
||||
DATA_CHILDREN : 'data-children'
|
||||
}
|
||||
|
||||
|
||||
@ -84,6 +85,14 @@ const Collapse = (($) => {
|
||||
this._addAriaAndCollapsedClass(this._element, this._triggerArray)
|
||||
}
|
||||
|
||||
this._selectorActives = Selector.ACTIVES
|
||||
if (this._parent) {
|
||||
const childrenSelector = this._parent.hasAttribute(Selector.DATA_CHILDREN) ? this._parent.getAttribute(Selector.DATA_CHILDREN) : null
|
||||
if (childrenSelector !== null) {
|
||||
this._selectorActives = childrenSelector + ' > .show, ' + childrenSelector + ' > .collapsing'
|
||||
}
|
||||
}
|
||||
|
||||
if (this._config.toggle) {
|
||||
this.toggle()
|
||||
}
|
||||
@ -124,7 +133,7 @@ const Collapse = (($) => {
|
||||
let activesData
|
||||
|
||||
if (this._parent) {
|
||||
actives = $.makeArray($(this._parent).find(Selector.ACTIVES))
|
||||
actives = $.makeArray($(this._parent).find(this._selectorActives))
|
||||
if (!actives.length) {
|
||||
actives = null
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user