From: XhmikosR Date: Wed, 20 Mar 2024 16:00:23 +0000 (+0200) Subject: Merge branch 'main' into gs/tweak-collapse-js-selector X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fgs%2Ftweak-collapse-js-selector;p=thirdparty%2Fbootstrap.git Merge branch 'main' into gs/tweak-collapse-js-selector --- 125715c385bc4503a5902b937ec52a2909dd0926 diff --cc js/src/collapse.js index 6ac77a2a86,9f0c60cc53..8f5f8b389e --- a/js/src/collapse.js +++ b/js/src/collapse.js @@@ -181,10 -180,10 +179,10 @@@ class Collapse extends BaseComponent reflow(this._element) this._element.classList.add(CLASS_NAME_COLLAPSING) - this._element.classList.remove(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW) + this._element.classList.remove(CLASS_NAME_SHOW) for (const trigger of this._triggerArray) { - const element = getElementFromSelector(trigger) + const element = SelectorEngine.getElementFromSelector(trigger) if (element && !this._isShown(element)) { this._addAriaAndCollapsedClass([trigger], false)