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
b1a9168b
Commit
b1a9168b
authored
10 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
grunt dist
parent
6ac5708a
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dist/js/bootstrap.js
+13
-3
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+2
-2
dist/js/bootstrap.min.js
docs/dist/js/bootstrap.min.js
+2
-2
docs/dist/js/bootstrap.min.js
with
17 additions
and
7 deletions
+17
-7
dist/js/bootstrap.js
+
13
-
3
View file @
b1a9168b
...
@@ -292,7 +292,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -292,7 +292,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
// =========================
// =========================
var
Carousel
=
function
(
element
,
options
)
{
var
Carousel
=
function
(
element
,
options
)
{
this
.
$element
=
$
(
element
)
this
.
$element
=
$
(
element
)
.
on
(
'
keydown.bs.carousel
'
,
$
.
proxy
(
this
.
keydown
,
this
))
this
.
$indicators
=
this
.
$element
.
find
(
'
.carousel-indicators
'
)
this
.
$indicators
=
this
.
$element
.
find
(
'
.carousel-indicators
'
)
this
.
options
=
options
this
.
options
=
options
this
.
paused
=
this
.
paused
=
...
@@ -302,8 +302,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -302,8 +302,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this
.
$items
=
null
this
.
$items
=
null
this
.
options
.
pause
==
'
hover
'
&&
this
.
$element
this
.
options
.
pause
==
'
hover
'
&&
this
.
$element
.
on
(
'
mouseenter
'
,
$
.
proxy
(
this
.
pause
,
this
))
.
on
(
'
mouseenter
.bs.carousel
'
,
$
.
proxy
(
this
.
pause
,
this
))
.
on
(
'
mouseleave
'
,
$
.
proxy
(
this
.
cycle
,
this
))
.
on
(
'
mouseleave
.bs.carousel
'
,
$
.
proxy
(
this
.
cycle
,
this
))
}
}
Carousel
.
VERSION
=
'
3.1.1
'
Carousel
.
VERSION
=
'
3.1.1
'
...
@@ -314,6 +314,16 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -314,6 +314,16 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
wrap
:
true
wrap
:
true
}
}
Carousel
.
prototype
.
keydown
=
function
(
e
)
{
switch
(
e
.
which
)
{
case
37
:
this
.
prev
();
break
case
39
:
this
.
next
();
break
default
:
return
}
e
.
preventDefault
()
}
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
e
||
(
this
.
paused
=
false
)
e
||
(
this
.
paused
=
false
)
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.min.js
+
2
-
2
View file @
b1a9168b
This diff is collapsed.
Click to expand it.
docs/dist/js/bootstrap.min.js
+
2
-
2
View file @
b1a9168b
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