rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-04-11 03:02:27 +02:00
Code Issues Actions 12 Packages Releases Activity

fix jquery detection

Browse Source
This commit is contained in:
Johann-S 2019-03-01 14:52:43 +01:00 committed by XhmikosR
parent dad0765ed3
commit 86de1d3875
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/src/index.js
View File

@ -1,4 +1,3 @@
import $ from 'jquery'
import Alert from './alert' import Alert from './alert'
import Button from './button' import Button from './button'
import Carousel from './carousel' import Carousel from './carousel'
@ -19,23 +18,6 @@ import Util from './util'
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
*/ */
(() => {
if (typeof $ === 'undefined') {
throw new TypeError('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.')
}
const version = $.fn.jquery.split(' ')[0].split('.')
const minMajor = 1
const ltMajor = 2
const minMinor = 9
const minPatch = 1
const maxMajor = 4
if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {
throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')
}
})()
export { export {
Util, Util,
Alert, Alert,

18
js/src/util.js
View File

@ -169,9 +169,27 @@ const Util = {
} }
return Util.findShadowRoot(element.parentNode) return Util.findShadowRoot(element.parentNode)
},
jQueryDetection() {
if (typeof $ === 'undefined') {
throw new TypeError('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.')
}
const version = $.fn.jquery.split(' ')[0].split('.')
const minMajor = 1
const ltMajor = 2
const minMinor = 9
const minPatch = 1
const maxMajor = 4
if (version[0] < ltMajor && version[1] < minMinor || version[0] === minMajor && version[1] === minMinor && version[2] < minPatch || version[0] >= maxMajor) {
throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')
}
} }
} }
Util.jQueryDetection()
setTransitionEndSupport() setTransitionEndSupport()
export default Util export default Util

5
js/tests/unit/util.js
View File

@ -160,4 +160,9 @@ $(function () {
sandbox.restore() sandbox.restore()
} }
}) })
QUnit.test('Util.jQueryDetection should detect jQuery', function (assert) {
assert.expect(0)
Util.jQueryDetection()
})
}) })