mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-28 06:20:15 +02:00
Code Issues Releases Wiki Activity

fix: remove make array util function (#30430)

Browse Source
This commit is contained in:
Johann-S
2020-03-25 15:35:02 +01:00
committed by GitHub
parent 98c4598696
commit 26d86fce2a
17 changed files with 53 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/collapse.js
View File

@@ -13,7 +13,6 @@ import {
getElementFromSelector,
getTransitionDurationFromElement,
isElement,
makeArray,
reflow,
typeCheckConfig
} from './util/index'
@@ -72,16 +71,17 @@ class Collapse {
this._isTransitioning = false
this._element = element
this._config = this._getConfig(config)
this._triggerArray = makeArray(SelectorEngine.find(
this._triggerArray = SelectorEngine.find(
`${SELECTOR_DATA_TOGGLE}[href="#${element.id}"],` +
`${SELECTOR_DATA_TOGGLE}[data-target="#${element.id}"]`
))
)
const toggleList = SelectorEngine.find(SELECTOR_DATA_TOGGLE)
const toggleList = makeArray(SelectorEngine.find(SELECTOR_DATA_TOGGLE))
for (let i = 0, len = toggleList.length; i < len; i++) {
const elem = toggleList[i]
const selector = getSelectorFromElement(elem)
const filterElement = makeArray(SelectorEngine.find(selector))
const filterElement = SelectorEngine.find(selector)
.filter(foundElem => foundElem === element)
if (selector !== null && filterElement.length) {
@@ -133,7 +133,7 @@ class Collapse {
let activesData
if (this._parent) {
actives = makeArray(SelectorEngine.find(SELECTOR_ACTIVES, this._parent))
actives = SelectorEngine.find(SELECTOR_ACTIVES, this._parent)
.filter(elem => {
if (typeof this._config.parent === 'string') {
return elem.getAttribute('data-parent') === this._config.parent
@@ -307,7 +307,7 @@ class Collapse {
const selector = `${SELECTOR_DATA_TOGGLE}[data-parent="${parent}"]`
makeArray(SelectorEngine.find(selector, parent))
SelectorEngine.find(selector, parent)
.forEach(element => {
const selected = getElementFromSelector(element)
@@ -390,7 +390,7 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (
const triggerData = Manipulator.getDataAttributes(this)
const selector = getSelectorFromElement(this)
const selectorElements = makeArray(SelectorEngine.find(selector))
const selectorElements = SelectorEngine.find(selector)
selectorElements.forEach(element => {
const data = Data.getData(element, DATA_KEY)