mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-13 17:14:04 +02:00
Code Issues Releases Wiki 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
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' + '* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
'* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' + '* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
'*/\n', '*/\n',
jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n',
// Task configuration. // Task configuration.
clean: { clean: {
dist: ['dist'] dist: ['dist']
}, },
concat: { concat: {
options: { options: {
banner: '<%= banner %>', banner: '<%= banner %><%= jqueryCheck %>',
stripBanners: false stripBanners: false
}, },
bootstrap: { bootstrap: {

2
dist/js/bootstrap.js vendored
View File

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