kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

re-integrate #8560 using @fat's code from the comment on #8614

Browse source
This commit is contained in:
Chris Rebert 2013-07-26 01:15:41 -07:00
parent 292d8d6819
commit a317f67c1c
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gruntfile.js
View file

@ -9,13 +9,14 @@ module.exports = function(grunt) {
'* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
'* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
'*/\n',
jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n',
// Task configuration.
clean: {
dist: ['dist']
},
concat: {
options: {
banner: '<%= banner %>',
banner: '<%= banner %><%= jqueryCheck %>',
stripBanners: false
},
bootstrap: {

2
dist/js/bootstrap.js vendored
View file

@ -3,6 +3,8 @@
* Copyright 2013 Twitter Inc.
* http://www.apache.org/licenses/LICENSE-2.0
*/
if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
/* ========================================================================
* Bootstrap: transition.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#transitions

2
dist/js/bootstrap.min.js vendored
View file

File diff suppressed because one or more lines are too long