rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00
Code Issues Actions Packages Releases Activity

Detach accordions from .card

Browse Source
This commit is contained in:
Johann-S 2017-03-07 10:46:08 +01:00
parent 95f37e4c40
commit 099486f294
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/collapse.js
View File

@ -57,7 +57,8 @@ const Collapse = (($) => {
const Selector = { const Selector = {
ACTIVES : '.card > .show, .card > .collapsing', 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._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) { if (this._config.toggle) {
this.toggle() this.toggle()
} }
@ -124,7 +133,7 @@ const Collapse = (($) => {
let activesData let activesData
if (this._parent) { if (this._parent) {
actives = $.makeArray($(this._parent).find(Selector.ACTIVES)) actives = $.makeArray($(this._parent).find(this._selectorActives))
if (!actives.length) { if (!actives.length) {
actives = null actives = null
} }