Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
92c2ad98
Commit
92c2ad98
authored
Aug 11, 2013
by
Jacob Thornton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #8983
parent
b8ed111a
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
8 deletions
+21
-8
dist/css/bootstrap.css
dist/css/bootstrap.css
+1
-2
dist/css/bootstrap.min.css
dist/css/bootstrap.min.css
+1
-1
dist/js/bootstrap.js
dist/js/bootstrap.js
+6
-2
dist/js/bootstrap.min.js
dist/js/bootstrap.min.js
+1
-1
javascript.html
javascript.html
+6
-0
js/carousel.js
js/carousel.js
+6
-2
No files found.
dist/css/bootstrap.css
View file @
92c2ad98
...
...
@@ -346,7 +346,7 @@ img {
}
.img-circle
{
border-radius
:
50
0px
;
border-radius
:
50
%
;
}
hr
{
...
...
@@ -4475,7 +4475,6 @@ a.list-group-item.active > .badge,
filter
:
alpha
(
opacity
=
90
);
}
.carousel-control
.glyphicon
,
.carousel-control
.icon-prev
,
.carousel-control
.icon-next
{
position
:
absolute
;
...
...
dist/css/bootstrap.min.css
View file @
92c2ad98
This source diff could not be displayed because it is too large. You can
view the blob
instead.
dist/js/bootstrap.js
View file @
92c2ad98
...
...
@@ -314,6 +314,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
Carousel
.
DEFAULTS
=
{
interval
:
5000
,
pause
:
'
hover
'
,
wrap
:
true
}
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
...
...
@@ -378,12 +379,15 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
var
fallback
=
type
==
'
next
'
?
'
first
'
:
'
last
'
var
that
=
this
if
(
!
$next
.
length
)
{
if
(
!
this
.
options
.
wrap
)
return
$next
=
this
.
$element
.
find
(
'
.item
'
)[
fallback
]()
}
this
.
sliding
=
true
isCycling
&&
this
.
pause
()
$next
=
$next
.
length
?
$next
:
this
.
$element
.
find
(
'
.item
'
)[
fallback
]()
var
e
=
$
.
Event
(
'
slide.bs.carousel
'
,
{
relatedTarget
:
$next
[
0
],
direction
:
direction
})
if
(
$next
.
hasClass
(
'
active
'
))
return
...
...
dist/js/bootstrap.min.js
View file @
92c2ad98
This diff is collapsed.
Click to expand it.
javascript.html
View file @
92c2ad98
...
...
@@ -1722,6 +1722,12 @@ $('.carousel').carousel()
<td>
"hover"
</td>
<td>
Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.
</td>
</tr>
<tr>
<td>
wrap
</td>
<td>
boolean
</td>
<td>
true
</td>
<td>
Whether the carousel should cycle continuously or have hard stops.
</td>
</tr>
</tbody>
</table>
</div>
<!-- /.bs-table-scrollable -->
...
...
js/carousel.js
View file @
92c2ad98
...
...
@@ -41,6 +41,7 @@
Carousel
.
DEFAULTS
=
{
interval
:
5000
,
pause
:
'
hover
'
,
wrap
:
true
}
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
...
...
@@ -105,12 +106,15 @@
var
fallback
=
type
==
'
next
'
?
'
first
'
:
'
last
'
var
that
=
this
if
(
!
$next
.
length
)
{
if
(
!
this
.
options
.
wrap
)
return
$next
=
this
.
$element
.
find
(
'
.item
'
)[
fallback
]()
}
this
.
sliding
=
true
isCycling
&&
this
.
pause
()
$next
=
$next
.
length
?
$next
:
this
.
$element
.
find
(
'
.item
'
)[
fallback
]()
var
e
=
$
.
Event
(
'
slide.bs.carousel
'
,
{
relatedTarget
:
$next
[
0
],
direction
:
direction
})
if
(
$next
.
hasClass
(
'
active
'
))
return
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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