mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-26 06:44:35 +02:00
Code Issues Releases Wiki Activity

Use transitionEnd in QUnit since we moved away from PhantomJS

Browse Source
This commit is contained in:
Johann-S
2018-03-20 11:07:58 +01:00
parent 2306f62bf1
commit bedc96e48b
12 changed files with 224 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/modal.js
View File

@@ -107,7 +107,7 @@ const Modal = (($) => {
return
}
if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE)) {
if ($(this._element).hasClass(ClassName.FADE)) {
this._isTransitioning = true
}
@@ -168,8 +168,7 @@ const Modal = (($) => {
}
this._isShown = false
const transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE)
const transition = $(this._element).hasClass(ClassName.FADE)
if (transition) {
this._isTransitioning = true
@@ -228,8 +227,7 @@ const Modal = (($) => {
}
_showElement(relatedTarget) {
const transition = Util.supportsTransitionEnd() &&
$(this._element).hasClass(ClassName.FADE)
const transition = $(this._element).hasClass(ClassName.FADE)
if (!this._element.parentNode ||
this._element.parentNode.nodeType !== Node.ELEMENT_NODE) {
@@ -331,8 +329,6 @@ const Modal = (($) => {
? ClassName.FADE : ''
if (this._isShown && this._config.backdrop) {
const doAnimate = Util.supportsTransitionEnd() && animate
this._backdrop = document.createElement('div')
this._backdrop.className = ClassName.BACKDROP
@@ -357,7 +353,7 @@ const Modal = (($) => {
}
})
if (doAnimate) {
if (animate) {
Util.reflow(this._backdrop)
}
@@ -367,7 +363,7 @@ const Modal = (($) => {
return
}
if (!doAnimate) {
if (!animate) {
callback()
return
}
@@ -387,8 +383,7 @@ const Modal = (($) => {
}
}
if (Util.supportsTransitionEnd() &&
$(this._element).hasClass(ClassName.FADE)) {
if ($(this._element).hasClass(ClassName.FADE)) {
const backdropTransitionDuration = Util.getTransitionDurationFromElement(this._backdrop)
$(this._backdrop)