diff options
| author | Johann-S <[email protected]> | 2019-07-23 21:15:00 +0200 |
|---|---|---|
| committer | Johann-S <[email protected]> | 2019-07-24 11:27:35 +0200 |
| commit | fc02932946424e986a72bb7b47044eab815851cb (patch) | |
| tree | 1fb51782942b8cd3d52edaa7146971c5e40a825b /js/src/collapse | |
| parent | f4dbffe93adf5c71e16cc07dda24e66ce72d30b5 (diff) | |
| download | bootstrap-fc02932946424e986a72bb7b47044eab815851cb.tar.xz bootstrap-fc02932946424e986a72bb7b47044eab815851cb.zip | |
use get selector from element only when needed
Diffstat (limited to 'js/src/collapse')
| -rw-r--r-- | js/src/collapse/collapse.js | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/js/src/collapse/collapse.js b/js/src/collapse/collapse.js index 671dc3b6c..c1d9aa2f1 100644 --- a/js/src/collapse/collapse.js +++ b/js/src/collapse/collapse.js @@ -10,6 +10,7 @@ import { TRANSITION_END, emulateTransitionEnd, getSelectorFromElement, + getElementFromSelector, getTransitionDurationFromElement, isElement, makeArray, @@ -244,15 +245,11 @@ class Collapse { if (triggerArrayLength > 0) { for (let i = 0; i < triggerArrayLength; i++) { const trigger = this._triggerArray[i] - const selector = getSelectorFromElement(trigger) + const elem = getElementFromSelector(trigger) - if (selector !== null) { - const elem = SelectorEngine.findOne(selector) - - if (!elem.classList.contains(ClassName.SHOW)) { - trigger.classList.add(ClassName.COLLAPSED) - trigger.setAttribute('aria-expanded', false) - } + if (elem && !elem.classList.contains(ClassName.SHOW)) { + trigger.classList.add(ClassName.COLLAPSED) + trigger.setAttribute('aria-expanded', false) } } } @@ -320,8 +317,7 @@ class Collapse { makeArray(SelectorEngine.find(selector, parent)) .forEach(element => { - const selector = getSelectorFromElement(element) - const selected = selector ? SelectorEngine.findOne(selector) : null + const selected = getElementFromSelector(element) this._addAriaAndCollapsedClass( selected, |