mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

alternative

Browse Source
This commit is contained in:
GeoSot
2022-01-17 15:20:58 +02:00
parent a2b32f1f5c
commit a0c39eaf40
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/src/collapse.js
+3 -5
View File
@@ -41,7 +41,7 @@ const CLASS_NAME_HORIZONTAL = 'collapse-horizontal'
const WIDTH = 'width' const WIDTH = 'width'
const HEIGHT = 'height' 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 SELECTOR_DATA_TOGGLE = '[data-bs-toggle="collapse"]'
const Default = { const Default = {
@@ -139,7 +139,6 @@ class Collapse extends BaseComponent {
const dimension = this._getDimension() const dimension = this._getDimension()
this._element.classList.remove(CLASS_NAME_COLLAPSE)
this._element.classList.add(CLASS_NAME_COLLAPSING) this._element.classList.add(CLASS_NAME_COLLAPSING)
this._element.style[dimension] = 0 this._element.style[dimension] = 0
@@ -151,7 +150,7 @@ class Collapse extends BaseComponent {
this._isTransitioning = false this._isTransitioning = false
this._element.classList.remove(CLASS_NAME_COLLAPSING) 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] = '' this._element.style[dimension] = ''
@@ -182,7 +181,7 @@ class Collapse extends BaseComponent {
reflow(this._element) reflow(this._element)
this._element.classList.add(CLASS_NAME_COLLAPSING) 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) { for (const trigger of this._triggerArray) {
const element = getElementFromSelector(trigger) const element = getElementFromSelector(trigger)
@@ -197,7 +196,6 @@ class Collapse extends BaseComponent {
const complete = () => { const complete = () => {
this._isTransitioning = false this._isTransitioning = false
this._element.classList.remove(CLASS_NAME_COLLAPSING) this._element.classList.remove(CLASS_NAME_COLLAPSING)
this._element.classList.add(CLASS_NAME_COLLAPSE)
EventHandler.trigger(this._element, EVENT_HIDDEN) EventHandler.trigger(this._element, EVENT_HIDDEN)
} }
scss/_transitions.scss
+1 -1
View File
@@ -8,7 +8,7 @@
// scss-docs-start collapse-classes // scss-docs-start collapse-classes
.collapse { .collapse {
&:not(.show) { &:not(.show):not(.collapsing) {
display: none; display: none;
} }
} }