From: GeoSot <geo.sotis@gmail.com>
Date: Mon, 17 Jan 2022 13:20:58 +0000 (+0200)
Subject: alternative
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0c39eaf40e2c1c83c347dc33539c9b8281dde2b;p=thirdparty%2Fbootstrap.git

alternative
---

diff --git a/js/src/collapse.js b/js/src/collapse.js
index 1d2572db0f..6ac77a2a86 100644
--- a/js/src/collapse.js
+++ b/js/src/collapse.js
@@ -41,7 +41,7 @@ const CLASS_NAME_HORIZONTAL = 'collapse-horizontal'
 const WIDTH = 'width'
 const HEIGHT = 'height'
 
-const SELECTOR_ACTIVES = '.collapse.show, .collapsing'
+const SELECTOR_ACTIVES = '.collapse.show, .collapse.collapsing'
 const SELECTOR_DATA_TOGGLE = '[data-bs-toggle="collapse"]'
 
 const Default = {
@@ -139,7 +139,6 @@ class Collapse extends BaseComponent {
 
     const dimension = this._getDimension()
 
-    this._element.classList.remove(CLASS_NAME_COLLAPSE)
     this._element.classList.add(CLASS_NAME_COLLAPSING)
 
     this._element.style[dimension] = 0
@@ -151,7 +150,7 @@ class Collapse extends BaseComponent {
       this._isTransitioning = false
 
       this._element.classList.remove(CLASS_NAME_COLLAPSING)
-      this._element.classList.add(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW)
+      this._element.classList.add(CLASS_NAME_SHOW)
 
       this._element.style[dimension] = ''
 
@@ -182,7 +181,7 @@ 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)
@@ -197,7 +196,6 @@ class Collapse extends BaseComponent {
     const complete = () => {
       this._isTransitioning = false
       this._element.classList.remove(CLASS_NAME_COLLAPSING)
-      this._element.classList.add(CLASS_NAME_COLLAPSE)
       EventHandler.trigger(this._element, EVENT_HIDDEN)
     }
 
diff --git a/scss/_transitions.scss b/scss/_transitions.scss
index bfb26aa8ac..ade2414fe2 100644
--- a/scss/_transitions.scss
+++ b/scss/_transitions.scss
@@ -8,7 +8,7 @@
 
 // scss-docs-start collapse-classes
 .collapse {
-  &:not(.show) {
+  &:not(.show):not(.collapsing) {
     display: none;
   }
 }