From: Chris Rebert Date: Thu, 21 Jul 2016 15:14:21 +0000 (-0700) Subject: Update jQuery version check and jQuery dependency version range (#20338) X-Git-Tag: v3.3.7~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edefe0e77a39149f971c4215301f7f8a7f15f210;p=thirdparty%2Fbootstrap.git Update jQuery version check and jQuery dependency version range (#20338) Closes #16834 [skip validator] --- diff --git a/bower.json b/bower.json index 58ae0935ba..b1b1bc0da5 100644 --- a/bower.json +++ b/bower.json @@ -29,6 +29,6 @@ "test-infra" ], "dependencies": { - "jquery": "1.9.1 - 2" + "jquery": "1.9.1 - 3" } } diff --git a/grunt/configBridge.json b/grunt/configBridge.json index 45cf98b88d..9d1a142f21 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) || (version[0] > 2)) {", - " throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')", + " 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 jQuery version 1.9.1 or higher, but lower than version 4')", " }", "}(jQuery);\n\n" ]