diff options
| author | XhmikosR <[email protected]> | 2015-11-16 09:21:02 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2015-11-16 09:28:28 +0200 |
| commit | add3ce38f78094787634f6a145ad14bdfad57bb2 (patch) | |
| tree | 8fc40d8e1e6efb36c6016a0c08f38203e0f3c0b2 | |
| parent | 7a2ba9a22413b113a54ca8644a84cbd69f28d20e (diff) | |
| download | bootstrap-add3ce38f78094787634f6a145ad14bdfad57bb2.tar.xz bootstrap-add3ce38f78094787634f6a145ad14bdfad57bb2.zip | |
Revert "Make jQuery 2.0 the minimum supported version."
This partially reverts commit 9eded912a05082a89ef30b899bbe659cb9ce254c.
| -rw-r--r-- | Gruntfile.js | 4 | ||||
| -rw-r--r-- | bower.json | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 961feed9f..c17c353d3 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 b7e9f645f..0d24a6392 100644 --- a/bower.json +++ b/bower.json @@ -29,6 +29,6 @@ "test-infra" ], "dependencies": { - "jquery": "2" + "jquery": "1.9.1 - 2" } } |