diff options
| author | XhmikosR <[email protected]> | 2015-11-16 09:53:03 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2015-11-16 10:03:57 +0200 |
| commit | eea6690d0e47b25a02bb42e610fde7e5ecd247d7 (patch) | |
| tree | 267d5a5c035e0eb404f64dd654369995ee5f8b4c /dist/js/bootstrap.js | |
| parent | 1b645ef686c61fef6be87c5ef15411cbeb869702 (diff) | |
| download | bootstrap-eea6690d0e47b25a02bb42e610fde7e5ecd247d7.tar.xz bootstrap-eea6690d0e47b25a02bb42e610fde7e5ecd247d7.zip | |
Run `grunt`.
[ci skip]
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 0123631c9..4d4b14bb9 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -10,8 +10,8 @@ if (typeof jQuery === 'undefined') { +function ($) { var version = $.fn.jquery.split(' ')[0].split('.') - if (version[0] !== '2') { - throw new Error('Bootstrap\'s JavaScript requires jQuery version 2.x.x') + if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 3)) { + throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v3.0.0') } }(jQuery); @@ -2768,8 +2768,8 @@ var Tooltip = (function ($) { * Check for Tether dependency * Tether - http://github.hubspot.com/tether/ */ - if (!window.Tether) { - throw new Error("Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)"); + if (window.Tether === undefined) { + throw new Error('Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)'); } /** |