Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
124d7e62
Commit
124d7e62
authored
11 years ago
by
fat
Browse files
Options
Download
Email Patches
Plain Diff
fixes
#8560
parent
0190128e
2 merge requests
!8635
ignore Gruntfile.js in jekyll
,
!8656
Added rel="stylesheet" to CDN-Examples
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+1
-1
Makefile
dist/js/bootstrap.js
+3
-1
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+1
-1
dist/js/bootstrap.min.js
with
5 additions
and
3 deletions
+5
-3
Makefile
+
1
-
1
View file @
124d7e62
...
...
@@ -27,7 +27,7 @@ build:
@
cp
js/tests/vendor/jquery.js assets/js/
@
echo
"
${CHECK}
"
@
printf
"Compiling and minifying JavaScript..."
@
cat
js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js
>
dist/js/bootstrap.js
@
echo
"if (!jQuery) throw new Error(
\"
Bootstrap requires jQuery
\"
)
\n
"
|
cat
-
js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js
>
dist/js/bootstrap.js
@
uglifyjs
-nc
dist/js/bootstrap.js
>
dist/js/bootstrap.min.tmp.js
@
echo
"/**
\n
* Bootstrap.js v3.0.0 by @fat & @mdo
\n
* Copyright 2013 Twitter, Inc.
\n
* http://www.apache.org/licenses/LICENSE-2.0.txt
\n
*/"
>
dist/js/copyright.js
@
cat
dist/js/copyright.js dist/js/bootstrap.min.tmp.js
>
dist/js/bootstrap.min.js
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.js
+
3
-
1
View file @
124d7e62
if
(
!
jQuery
)
throw
new
Error
(
"
Bootstrap requires jQuery
"
)
/* ========================================================================
* Bootstrap: transition.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#transitions
...
...
@@ -1573,7 +1575,7 @@
return
(
$href
&&
$href
.
length
&&
[[
$href
.
position
().
top
+
(
!
$
.
isWindow
(
self
.
$scrollElement
.
get
(
0
))
&&
self
.
$scrollElement
.
scrollTop
()),
href
]])
||
null
&&
[[
$href
.
offset
().
top
+
(
!
$
.
isWindow
(
self
.
$scrollElement
.
get
(
0
))
&&
self
.
$scrollElement
.
scrollTop
()),
href
]])
||
null
})
.
sort
(
function
(
a
,
b
)
{
return
a
[
0
]
-
b
[
0
]
})
.
each
(
function
()
{
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.min.js
+
1
-
1
View file @
124d7e62
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
Menu
Explore
Projects
Groups
Snippets