rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

collapse: extract duplicate code to a function

Browse Source
This commit is contained in:
GeoSot 2021-10-10 12:36:18 +03:00 committed by XhmikosR
parent 99f6cf509d
commit 1eea132866
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/collapse.js
View File

@ -8,8 +8,8 @@
import {
defineJQueryPlugin,
getElement,
getSelectorFromElement,
getElementFromSelector,
getSelectorFromElement,
reflow,
typeCheckConfig
} from './util/index'
@ -120,9 +120,7 @@ class Collapse extends BaseComponent {
let activesData
if (this._config.parent) {
const children = SelectorEngine.find(CLASS_NAME_DEEPER_CHILDREN, this._config.parent)
// remove children if greater depth
actives = SelectorEngine.find(SELECTOR_ACTIVES, this._config.parent).filter(elem => !children.includes(elem))
actives = this._getFirstLevelChildren(SELECTOR_ACTIVES)
}
const container = SelectorEngine.findOne(this._selector)
@ -245,10 +243,9 @@ class Collapse extends BaseComponent {
return
}
const children = SelectorEngine.find(CLASS_NAME_DEEPER_CHILDREN, this._config.parent)
const elements = SelectorEngine.find(SELECTOR_DATA_TOGGLE, this._config.parent).filter(elem => !children.includes(elem))
const children = this._getFirstLevelChildren(SELECTOR_DATA_TOGGLE)
for (const element of elements) {
for (const element of children) {
const selected = getElementFromSelector(element)
if (selected) {
@ -257,6 +254,12 @@ class Collapse extends BaseComponent {
}
}
_getFirstLevelChildren(selector) {
const children = SelectorEngine.find(CLASS_NAME_DEEPER_CHILDREN, this._config.parent)
// remove children if greater depth
return SelectorEngine.find(selector, this._config.parent).filter(elem => !children.includes(elem))
}
_addAriaAndCollapsedClass(triggerArray, isOpen) {
if (!triggerArray.length) {
return