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
80abc50d
Commit
80abc50d
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts: docs/assets/bootstrap.zip
parents
f3ad4c71
d149a131
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/assets/js/bootstrap-carousel.js
+2
-2
docs/assets/js/bootstrap-carousel.js
js/bootstrap-carousel.js
+2
-2
js/bootstrap-carousel.js
with
4 additions
and
4 deletions
+4
-4
docs/assets/bootstrap.zip
+
0
-
0
View file @
80abc50d
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-carousel.js
+
2
-
2
View file @
80abc50d
...
...
@@ -83,14 +83,14 @@
,
fallback
=
type
==
'
next
'
?
'
first
'
:
'
last
'
,
that
=
this
if
(
!
$next
.
length
)
return
this
.
sliding
=
true
isCycling
&&
this
.
pause
()
$next
=
$next
.
length
?
$next
:
this
.
$element
.
find
(
'
.item
'
)[
fallback
]()
if
(
$next
.
hasClass
(
'
active
'
))
return
if
(
!
$
.
support
.
transition
&&
this
.
$element
.
hasClass
(
'
slide
'
))
{
this
.
$element
.
trigger
(
'
slide
'
)
$active
.
removeClass
(
'
active
'
)
...
...
This diff is collapsed.
Click to expand it.
js/bootstrap-carousel.js
+
2
-
2
View file @
80abc50d
...
...
@@ -83,14 +83,14 @@
,
fallback
=
type
==
'
next
'
?
'
first
'
:
'
last
'
,
that
=
this
if
(
!
$next
.
length
)
return
this
.
sliding
=
true
isCycling
&&
this
.
pause
()
$next
=
$next
.
length
?
$next
:
this
.
$element
.
find
(
'
.item
'
)[
fallback
]()
if
(
$next
.
hasClass
(
'
active
'
))
return
if
(
!
$
.
support
.
transition
&&
this
.
$element
.
hasClass
(
'
slide
'
))
{
this
.
$element
.
trigger
(
'
slide
'
)
$active
.
removeClass
(
'
active
'
)
...
...
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