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
b7398bc9
Commit
b7398bc9
authored
10 years ago
by
Chris Rebert
Browse files
Options
Download
Email Patches
Plain Diff
honor wrap option in Carousel.getItemForDirection; fixes
#15144
parent
8008fe70
5 merge requests
!28721
Hot test
,
!15152
honor wrap option in Carousel.getItemForDirection
,
!16605
Test pull please ignore
,
!22103
test
,
!25326
Adjust examples
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
js/carousel.js
+4
-7
js/carousel.js
with
4 additions
and
7 deletions
+4
-7
js/carousel.js
+
4
-
7
View file @
b7398bc9
...
...
@@ -70,8 +70,11 @@
}
Carousel
.
prototype
.
getItemForDirection
=
function
(
direction
,
active
)
{
var
delta
=
direction
==
'
prev
'
?
-
1
:
1
var
activeIndex
=
this
.
getItemIndex
(
active
)
var
willWrap
=
(
direction
==
'
prev
'
&&
activeIndex
===
0
)
||
(
direction
==
'
next
'
&&
activeIndex
==
(
this
.
$items
.
length
-
1
))
if
(
willWrap
&&
!
this
.
options
.
wrap
)
return
active
var
delta
=
direction
==
'
prev
'
?
-
1
:
1
var
itemIndex
=
(
activeIndex
+
delta
)
%
this
.
$items
.
length
return
this
.
$items
.
eq
(
itemIndex
)
}
...
...
@@ -116,14 +119,8 @@
var
$next
=
next
||
this
.
getItemForDirection
(
type
,
$active
)
var
isCycling
=
this
.
interval
var
direction
=
type
==
'
next
'
?
'
left
'
:
'
right
'
var
fallback
=
type
==
'
next
'
?
'
first
'
:
'
last
'
var
that
=
this
if
(
!
$next
.
length
)
{
if
(
!
this
.
options
.
wrap
)
return
$next
=
this
.
$element
.
find
(
'
.item
'
)[
fallback
]()
}
if
(
$next
.
hasClass
(
'
active
'
))
return
(
this
.
sliding
=
false
)
var
relatedTarget
=
$next
[
0
]
...
...
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