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
555a3b04
Commit
555a3b04
authored
Jun 02, 2012
by
Jacob Thornton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix carousel when hiding a reshowing - make sure it always triggers transition end #3248
parent
0b827965
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
3 deletions
+19
-3
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-carousel.js
+4
-0
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap-typeahead.js
+3
-1
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.js
+7
-1
docs/assets/js/bootstrap.min.js
docs/assets/js/bootstrap.min.js
+1
-1
js/bootstrap-carousel.js
js/bootstrap-carousel.js
+4
-0
No files found.
docs/assets/js/bootstrap-carousel.js
View file @
555a3b04
...
@@ -68,6 +68,10 @@
...
@@ -68,6 +68,10 @@
,
pause
:
function
(
e
)
{
,
pause
:
function
(
e
)
{
if
(
!
e
)
this
.
paused
=
true
if
(
!
e
)
this
.
paused
=
true
if
(
this
.
$element
.
find
(
'
.next, .prev
'
))
{
this
.
$element
.
trigger
(
$
.
support
.
transition
.
end
)
this
.
cycle
()
}
clearInterval
(
this
.
interval
)
clearInterval
(
this
.
interval
)
this
.
interval
=
null
this
.
interval
=
null
return
this
return
this
...
...
docs/assets/js/bootstrap-typeahead.js
View file @
555a3b04
...
@@ -178,6 +178,8 @@
...
@@ -178,6 +178,8 @@
}
}
,
move
:
function
(
e
)
{
,
move
:
function
(
e
)
{
if
(
!
this
.
shown
)
return
switch
(
e
.
keyCode
)
{
switch
(
e
.
keyCode
)
{
case
9
:
// tab
case
9
:
// tab
case
13
:
// enter
case
13
:
// enter
...
@@ -205,7 +207,7 @@
...
@@ -205,7 +207,7 @@
}
}
,
keypress
:
function
(
e
)
{
,
keypress
:
function
(
e
)
{
if
(
!
this
.
shown
||
this
.
suppressKeyPressRepeat
)
return
if
(
this
.
suppressKeyPressRepeat
)
return
this
.
move
(
e
)
this
.
move
(
e
)
}
}
...
...
docs/assets/js/bootstrap.js
View file @
555a3b04
...
@@ -312,6 +312,10 @@
...
@@ -312,6 +312,10 @@
,
pause
:
function
(
e
)
{
,
pause
:
function
(
e
)
{
if
(
!
e
)
this
.
paused
=
true
if
(
!
e
)
this
.
paused
=
true
if
(
this
.
$element
.
find
(
'
.next, .prev
'
))
{
this
.
$element
.
trigger
(
$
.
support
.
transition
.
end
)
this
.
cycle
()
}
clearInterval
(
this
.
interval
)
clearInterval
(
this
.
interval
)
this
.
interval
=
null
this
.
interval
=
null
return
this
return
this
...
@@ -1772,6 +1776,8 @@
...
@@ -1772,6 +1776,8 @@
}
}
,
move
:
function
(
e
)
{
,
move
:
function
(
e
)
{
if
(
!
this
.
shown
)
return
switch
(
e
.
keyCode
)
{
switch
(
e
.
keyCode
)
{
case
9
:
// tab
case
9
:
// tab
case
13
:
// enter
case
13
:
// enter
...
@@ -1799,7 +1805,7 @@
...
@@ -1799,7 +1805,7 @@
}
}
,
keypress
:
function
(
e
)
{
,
keypress
:
function
(
e
)
{
if
(
!
this
.
shown
||
this
.
suppressKeyPressRepeat
)
return
if
(
this
.
suppressKeyPressRepeat
)
return
this
.
move
(
e
)
this
.
move
(
e
)
}
}
...
...
docs/assets/js/bootstrap.min.js
View file @
555a3b04
This diff is collapsed.
Click to expand it.
js/bootstrap-carousel.js
View file @
555a3b04
...
@@ -68,6 +68,10 @@
...
@@ -68,6 +68,10 @@
,
pause
:
function
(
e
)
{
,
pause
:
function
(
e
)
{
if
(
!
e
)
this
.
paused
=
true
if
(
!
e
)
this
.
paused
=
true
if
(
this
.
$element
.
find
(
'
.next, .prev
'
))
{
this
.
$element
.
trigger
(
$
.
support
.
transition
.
end
)
this
.
cycle
()
}
clearInterval
(
this
.
interval
)
clearInterval
(
this
.
interval
)
this
.
interval
=
null
this
.
interval
=
null
return
this
return
this
...
...
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