diff options
| author | XhmikosR <[email protected]> | 2015-10-26 23:26:02 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2015-10-26 23:26:02 +0200 |
| commit | b0aa10219c31eb79d064fd7f62beba38b8b5ff6a (patch) | |
| tree | 5d07f38e89e8a421102f0cbbf1452aa41e8ebd91 /grunt | |
| parent | 2332a3f536be75c4407557435c91cae359816625 (diff) | |
| parent | 9eded912a05082a89ef30b899bbe659cb9ce254c (diff) | |
| download | bootstrap-b0aa10219c31eb79d064fd7f62beba38b8b5ff6a.tar.xz bootstrap-b0aa10219c31eb79d064fd7f62beba38b8b5ff6a.zip | |
Merge pull request #17494 from twbs/v4-dev-xmr-jquery-2.x
Switch to jQuery 2.x.x.
Diffstat (limited to 'grunt')
| -rw-r--r-- | grunt/configBridge.json | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/grunt/configBridge.json b/grunt/configBridge.json index 250aa1677..7b965bbb5 100644 --- a/grunt/configBridge.json +++ b/grunt/configBridge.json @@ -7,21 +7,5 @@ "../assets/js/vendor/tether.min.js", "../assets/js/src/application.js" ] - }, - "config": { - "jqueryCheck": [ - "if (typeof jQuery === 'undefined') {", - " throw new Error('Bootstrap\\'s JavaScript requires jQuery')", - "}\n" - ], - "jqueryVersionCheck": [ - "+function ($) {", - " 'use strict';", - " var version = $.fn.jquery.split(' ')[0].split('.')", - " if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 2)) {", - " throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')", - " }", - "}(jQuery);\n\n" - ] } } |