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
3a751a63
Commit
3a751a63
authored
12 years ago
by
Jacob Thornton
Browse files
Options
Download
Email Patches
Plain Diff
fix multi carousel bug
#3194
parent
555a3b04
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/js/bootstrap-carousel.js
+2
-1
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap.js
+2
-1
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
+1
-1
docs/assets/js/bootstrap.min.js
js/bootstrap-carousel.js
+2
-1
js/bootstrap-carousel.js
with
7 additions
and
4 deletions
+7
-4
docs/assets/js/bootstrap-carousel.js
+
2
-
1
View file @
3a751a63
...
...
@@ -144,9 +144,10 @@
var
$this
=
$
(
this
)
,
data
=
$this
.
data
(
'
carousel
'
)
,
options
=
$
.
extend
({},
$
.
fn
.
carousel
.
defaults
,
typeof
option
==
'
object
'
&&
option
)
,
action
=
typeof
option
==
'
string
'
?
option
:
options
.
slide
if
(
!
data
)
$this
.
data
(
'
carousel
'
,
(
data
=
new
Carousel
(
this
,
options
)))
if
(
typeof
option
==
'
number
'
)
data
.
to
(
option
)
else
if
(
typeof
option
==
'
string
'
||
(
option
=
options
.
slide
)
)
data
[
op
tion
]()
else
if
(
action
)
data
[
ac
tion
]()
else
if
(
options
.
interval
)
data
.
cycle
()
})
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.js
+
2
-
1
View file @
3a751a63
...
...
@@ -388,9 +388,10 @@
var
$this
=
$
(
this
)
,
data
=
$this
.
data
(
'
carousel
'
)
,
options
=
$
.
extend
({},
$
.
fn
.
carousel
.
defaults
,
typeof
option
==
'
object
'
&&
option
)
,
action
=
typeof
option
==
'
string
'
?
option
:
options
.
slide
if
(
!
data
)
$this
.
data
(
'
carousel
'
,
(
data
=
new
Carousel
(
this
,
options
)))
if
(
typeof
option
==
'
number
'
)
data
.
to
(
option
)
else
if
(
typeof
option
==
'
string
'
||
(
option
=
options
.
slide
)
)
data
[
op
tion
]()
else
if
(
action
)
data
[
ac
tion
]()
else
if
(
options
.
interval
)
data
.
cycle
()
})
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.min.js
+
1
-
1
View file @
3a751a63
This diff is collapsed.
Click to expand it.
js/bootstrap-carousel.js
+
2
-
1
View file @
3a751a63
...
...
@@ -144,9 +144,10 @@
var
$this
=
$
(
this
)
,
data
=
$this
.
data
(
'
carousel
'
)
,
options
=
$
.
extend
({},
$
.
fn
.
carousel
.
defaults
,
typeof
option
==
'
object
'
&&
option
)
,
action
=
typeof
option
==
'
string
'
?
option
:
options
.
slide
if
(
!
data
)
$this
.
data
(
'
carousel
'
,
(
data
=
new
Carousel
(
this
,
options
)))
if
(
typeof
option
==
'
number
'
)
data
.
to
(
option
)
else
if
(
typeof
option
==
'
string
'
||
(
option
=
options
.
slide
)
)
data
[
op
tion
]()
else
if
(
action
)
data
[
ac
tion
]()
else
if
(
options
.
interval
)
data
.
cycle
()
})
}
...
...
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