diff options
author | GeoSot <geo.sotis@gmail.com> | 2021-04-11 02:27:18 +0300 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2021-05-10 23:59:55 +0300 |
commit | 90b1a6907ed7bb3397fe6bd223f09eb12122d7a3 (patch) | |
tree | d666c155808a77ee51ab2296f549279b8f88873e /js/src/collapse.js | |
parent | 9106d2a0eaa53a58d6cf6eef7250634329578843 (diff) |
Merge js-components 'transitionend' listener callbacks into one method
Diffstat (limited to 'js/src/collapse.js')
-rw-r--r-- | js/src/collapse.js | 11 |
1 files changed, 2 insertions, 9 deletions
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) { |