aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGijs Boddeus <[email protected]>2018-01-10 21:49:10 +0100
committerGitHub <[email protected]>2018-01-10 21:49:10 +0100
commitec307bdf4b37449fd0355c344d83cf2850cf8f27 (patch)
treef36338e1bb0c793b869e469f63d1b7a0f9d28d42
parentd7dbdf91c6c09faccc9734165f8bd5a2cd7f5350 (diff)
parent1a231e4bee0e422b605f7454b697bd078e17ba3d (diff)
downloadbootstrap-ec307bdf4b37449fd0355c344d83cf2850cf8f27.tar.xz
bootstrap-ec307bdf4b37449fd0355c344d83cf2850cf8f27.zip
Merge branch 'v4-dev' into custom-check-disabled
-rw-r--r--js/src/util.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/src/util.js b/js/src/util.js
index 14653c86e..0ffbb76a3 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -39,7 +39,7 @@ const Util = (($) => {
}
function transitionEndTest() {
- if (window.QUnit) {
+ if (typeof window !== 'undefined' && window.QUnit) {
return false
}