From: XhmikosR <xhmikosr@gmail.com>
Date: Mon, 16 Nov 2015 07:21:02 +0000 (+0200)
Subject: Revert "Make jQuery 2.0 the minimum supported version."
X-Git-Tag: v4.0.0-alpha.2~120^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=add3ce38f78094787634f6a145ad14bdfad57bb2;p=thirdparty%2Fbootstrap.git

Revert "Make jQuery 2.0 the minimum supported version."

This partially reverts commit 9eded912a05082a89ef30b899bbe659cb9ce254c.
---

diff --git a/Gruntfile.js b/Gruntfile.js
index 961feed9f8..c17c353d39 100644
--- 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)) {\n' +
+                        '    throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery version 1.9.1 or higher\')\n' +
                         '  }\n' +
                         '}(jQuery);\n\n',
 
diff --git a/bower.json b/bower.json
index b7e9f645f2..0d24a6392c 100644
--- a/bower.json
+++ b/bower.json
@@ -29,6 +29,6 @@
     "test-infra"
   ],
   "dependencies": {
-    "jquery": "2"
+    "jquery": "1.9.1 - 2"
   }
 }