aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bower.json2
-rw-r--r--grunt/configBridge.json4
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"
]