From 90b1a6907ed7bb3397fe6bd223f09eb12122d7a3 Mon Sep 17 00:00:00 2001 From: GeoSot Date: Sun, 11 Apr 2021 02:27:18 +0300 Subject: Merge js-components 'transitionend' listener callbacks into one method --- js/src/collapse.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'js/src/collapse.js') diff --git a/js/src/collapse.js b/js/src/collapse.js index 947b6e6585..bd3846e053 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -7,10 +7,8 @@ import { defineJQueryPlugin, - emulateTransitionEnd, getSelectorFromElement, getElementFromSelector, - getTransitionDurationFromElement, isElement, reflow, typeCheckConfig @@ -200,11 +198,8 @@ class Collapse extends BaseComponent { const capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1) const scrollSize = `scroll${capitalizedDimension}` - const transitionDuration = getTransitionDurationFromElement(this._element) - EventHandler.one(this._element, 'transitionend', complete) - - emulateTransitionEnd(this._element, transitionDuration) + this._queueCallback(complete, this._element, true) this._element.style[dimension] = `${this._element[scrollSize]}px` } @@ -250,10 +245,8 @@ class Collapse extends BaseComponent { } this._element.style[dimension] = '' - const transitionDuration = getTransitionDurationFromElement(this._element) - EventHandler.one(this._element, 'transitionend', complete) - emulateTransitionEnd(this._element, transitionDuration) + this._queueCallback(complete, this._element, true) } setTransitioning(isTransitioning) { -- cgit v1.2.3