diff options
author | Johann-S <johann.servoire@gmail.com> | 2020-03-25 17:35:02 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-25 17:35:02 +0300 |
commit | 26d86fce2a10f5c9e295b0acf5e6381ff21368b4 (patch) | |
tree | 63ed06cb159ad7b625aa6b4c8d7460a1a269db43 /js/src/collapse.js | |
parent | 98c45986962f8ab16bc630722e96dbfb048079b3 (diff) |
fix: remove make array util function (#30430)
Diffstat (limited to 'js/src/collapse.js')
-rw-r--r-- | js/src/collapse.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/js/src/collapse.js b/js/src/collapse.js index 3b78c5cdb3..fde3e0a9ed 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -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) |