Skip to content

Commit

Permalink
Make jQuery 2.0 the minimum supported version.
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Oct 24, 2015
1 parent a50849f commit 9eded91
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ module.exports = function (grunt) {
'}\n',
jqueryVersionCheck: '+function ($) {\n' +
' var version = $.fn.jquery.split(\' \')[0].split(\'.\')\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' +
' if (version[0] !== \'2\') {\n' +
' throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery version 2.x.x\')\n' +
' }\n' +
'}(jQuery);\n\n',

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"test-infra"
],
"dependencies": {
"jquery": "1.9.1 - 2"
"jquery": "2"
}
}
16 changes: 0 additions & 16 deletions grunt/configBridge.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,5 @@
"../assets/js/vendor/tether.min.js",
"../assets/js/src/application.js"
]
},
"config": {
"jqueryCheck": [
"if (typeof jQuery === 'undefined') {",
" throw new Error('Bootstrap\\'s JavaScript requires jQuery')",
"}\n"
],
"jqueryVersionCheck": [
"+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) || (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"
]
}
}

0 comments on commit 9eded91

Please sign in to comment.