Skip to content

Commit 76594db

Browse files
committed
Merge pull request twbs#16896 from twbs/jquery-3
Bootstrap v3 does not currently claim to be compatible with jQuery v3
2 parents ef1ce9a + 9b1a213 commit 76594db

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
"test-infra"
3030
],
3131
"dependencies": {
32-
"jquery": ">= 1.9.1"
32+
"jquery": "1.9.1 - 2"
3333
}
3434
}

grunt/configBridge.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"+function ($) {",
3838
" 'use strict';",
3939
" var version = $.fn.jquery.split(' ')[0].split('.')",
40-
" if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {",
41-
" throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher')",
40+
" if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 2)) {",
41+
" throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')",
4242
" }",
4343
"}(jQuery);\n\n"
4444
]

0 commit comments

Comments
 (0)