Skip to content

B
bootstrap
Commit 76594dbb authored by Chris Rebert's avatar Chris Rebert
Browse files
Options

Merge pull request #16896 from twbs/jquery-3 

Bootstrap v3 does not currently claim to be compatible with jQuery v3
parents ef1ce9ac 9b1a213c
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
bower.json
View file @ 76594dbb
...@@ -29,6 +29,6 @@ ...@@ -29,6 +29,6 @@
"test-infra" "test-infra"
], ],
"dependencies": { "dependencies": {
"jquery": ">= 1.9.1" "jquery": "1.9.1 - 2"
} }
} }
grunt/configBridge.json
View file @ 76594dbb
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
"+function ($) {", "+function ($) {",
" 'use strict';", " 'use strict';",
" var version = $.fn.jquery.split(' ')[0].split('.')", " var version = $.fn.jquery.split(' ')[0].split('.')",
" if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {", " 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')", " throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')",
" }", " }",
"}(jQuery);\n\n" "}(jQuery);\n\n"
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment