mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-15 10:05:40 +02:00
Code Issues Releases Wiki Activity

collapse children with no data-parent

Browse Source
This commit is contained in:
Johann-S
2018-09-10 11:01:14 +02:00
parent de75bd0a4f
commit 6e2a823a44
2 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
js/src/collapse.js
View File

@@ -127,7 +127,13 @@ const Collapse = (($) => {
if (this._parent) {
actives = [].slice.call(this._parent.querySelectorAll(Selector.ACTIVES))
.filter((elem) => elem.getAttribute('data-parent') === this._config.parent)
.filter((elem) => {
if (typeof this._config.parent === 'string') {
return elem.getAttribute('data-parent') === this._config.parent
}
return elem.classList.contains(ClassName.COLLAPSE)
})
if (actives.length === 0) {
actives = null
@@ -282,7 +288,8 @@ const Collapse = (($) => {
}
_getParent() {
let parent = null
let parent
if (Util.isElement(this._config.parent)) {
parent = this._config.parent
@@ -309,14 +316,12 @@ const Collapse = (($) => {
}
_addAriaAndCollapsedClass(element, triggerArray) {
if (element) {
const isOpen = $(element).hasClass(ClassName.SHOW)
const isOpen = $(element).hasClass(ClassName.SHOW)
if (triggerArray.length) {
$(triggerArray)
.toggleClass(ClassName.COLLAPSED, !isOpen)
.attr('aria-expanded', isOpen)
}
if (triggerArray.length) {
$(triggerArray)
.toggleClass(ClassName.COLLAPSED, !isOpen)
.attr('aria-expanded', isOpen)
}
}