Commit 099486f2 authored by Johann-S's avatar Johann-S
Browse files

Detach accordions from .card

parent 95f37e4c
9 merge requests!28721Hot test,!27561Adds font-weight-medium to font weight classes,!22391V4 dev,!22598test,!22138Detach accordion from card,!25326Adjust examples,!23995Add back cursor: pointer for .btn-link,!23178Spinner,!17021v4
Showing with 11 additions and 2 deletions
+11 -2
......@@ -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
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment