Merge pull request twbs#18267 from twbs/v4-dev-xmr-revert-jquery2-requirement

cvrebert · cvrebert · commit ed624a805ae9 · 2015-11-16T00:00:21.000-08:00
Revert "Make jQuery 2.0 the minimum supported version."
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -63,8 +63,8 @@ module.exports = function (grunt) {
                  '}\n',
     jqueryVersionCheck: '+function ($) {\n' +
                         '  var version = $.fn.jquery.split(\' \')[0].split(\'.\')\n' +
-                        '  if (version[0] !== \'2\') {\n' +
-                        '    throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery version 2.x.x\')\n' +
+                        '  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 3)) {\n' +
+                        '    throw new Error(\'Bootstrap\\\'s JavaScript requires at least jQuery v1.9.1 but less than v3.0.0\')\n' +
                         '  }\n' +
                         '}(jQuery);\n\n',
 
diff --git a/bower.json b/bower.json
@@ -29,6 +29,6 @@
     "test-infra"
   ],
   "dependencies": {
-    "jquery": "2"
+    "jquery": "1.9.1 - 2"
   }
 }
