diff options
| author | Chris Rebert <[email protected]> | 2015-07-27 16:43:11 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-07-27 16:43:11 -0700 |
| commit | 76594dbb6aed95f3d50dce9af029aa4abeac0845 (patch) | |
| tree | 00d5a92766a3b18221e118d4ad777289b7825374 | |
| parent | ef1ce9ac0bbe7dbd513c2d603e3541fcdeac24ef (diff) | |
| parent | 9b1a213cf758e1b60e20c59a721a63e13da098f7 (diff) | |
| download | bootstrap-76594dbb6aed95f3d50dce9af029aa4abeac0845.tar.xz bootstrap-76594dbb6aed95f3d50dce9af029aa4abeac0845.zip | |
Merge pull request #16896 from twbs/jquery-3
Bootstrap v3 does not currently claim to be compatible with jQuery v3
| -rw-r--r-- | bower.json | 2 | ||||
| -rw-r--r-- | grunt/configBridge.json | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bower.json b/bower.json index 686bcf1ae..58ae0935b 100644 --- a/bower.json +++ b/bower.json @@ -29,6 +29,6 @@ "test-infra" ], "dependencies": { - "jquery": ">= 1.9.1" + "jquery": "1.9.1 - 2" } } diff --git a/grunt/configBridge.json b/grunt/configBridge.json index 8ce4c3d9a..0d93f4a66 100644 --- a/grunt/configBridge.json +++ b/grunt/configBridge.json @@ -37,8 +37,8 @@ "+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)) {", - " throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher')", + " 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" ] |