Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
a317f67c
Commit
a317f67c
authored
11 years ago
by
Chris Rebert
Browse files
Options
Download
Email Patches
Plain Diff
re-integrate
#8560
using @fat's code from the comment on #8614
parent
292d8d68
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Gruntfile.js
+2
-1
Gruntfile.js
dist/js/bootstrap.js
+2
-0
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+1
-1
dist/js/bootstrap.min.js
with
5 additions
and
2 deletions
+5
-2
Gruntfile.js
+
2
-
1
View file @
a317f67c
...
@@ -9,13 +9,14 @@ module.exports = function(grunt) {
...
@@ -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
:
{
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.js
+
2
-
0
View file @
a317f67c
...
@@ -3,6 +3,8 @@
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.min.js
+
1
-
1
View file @
a317f67c
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment