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
8c95ff74
Commit
8c95ff74
authored
10 years ago
by
XhmikosR
Browse files
Options
Download
Email Patches
Plain Diff
Run `grunt`.
parent
367da423
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dist/js/bootstrap.js
+4
-4
dist/js/bootstrap.js
docs/assets/js/raw-files.min.js
+1
-1
docs/assets/js/raw-files.min.js
test-infra/npm-shrinkwrap.canonical.json
+1
-1
test-infra/npm-shrinkwrap.canonical.json
with
6 additions
and
6 deletions
+6
-6
dist/js/bootstrap.js
+
4
-
4
View file @
8c95ff74
...
@@ -313,7 +313,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -313,7 +313,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
if
(
pos
>
(
this
.
$items
.
length
-
1
)
||
pos
<
0
)
return
if
(
pos
>
(
this
.
$items
.
length
-
1
)
||
pos
<
0
)
return
if
(
this
.
sliding
)
return
this
.
$element
.
one
(
'
slid.bs.carousel
'
,
function
()
{
that
.
to
(
pos
)
})
if
(
this
.
sliding
)
return
this
.
$element
.
one
(
'
slid.bs.carousel
'
,
function
()
{
that
.
to
(
pos
)
})
// yes, "slid". not a typo. past tense of "to slide".
if
(
activeIndex
==
pos
)
return
this
.
pause
().
cycle
()
if
(
activeIndex
==
pos
)
return
this
.
pause
().
cycle
()
return
this
.
slide
(
pos
>
activeIndex
?
'
next
'
:
'
prev
'
,
$
(
this
.
$items
[
pos
]))
return
this
.
slide
(
pos
>
activeIndex
?
'
next
'
:
'
prev
'
,
$
(
this
.
$items
[
pos
]))
...
@@ -367,7 +367,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -367,7 +367,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
if
(
this
.
$indicators
.
length
)
{
if
(
this
.
$indicators
.
length
)
{
this
.
$indicators
.
find
(
'
.active
'
).
removeClass
(
'
active
'
)
this
.
$indicators
.
find
(
'
.active
'
).
removeClass
(
'
active
'
)
this
.
$element
.
one
(
'
slid.bs.carousel
'
,
function
()
{
this
.
$element
.
one
(
'
slid.bs.carousel
'
,
function
()
{
// yes, "slid". not a typo. past tense of "to slide".
var
$nextIndicator
=
$
(
that
.
$indicators
.
children
()[
that
.
getActiveIndex
()])
var
$nextIndicator
=
$
(
that
.
$indicators
.
children
()[
that
.
getActiveIndex
()])
$nextIndicator
&&
$nextIndicator
.
addClass
(
'
active
'
)
$nextIndicator
&&
$nextIndicator
.
addClass
(
'
active
'
)
})
})
...
@@ -383,14 +383,14 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -383,14 +383,14 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
$next
.
removeClass
([
type
,
direction
].
join
(
'
'
)).
addClass
(
'
active
'
)
$next
.
removeClass
([
type
,
direction
].
join
(
'
'
)).
addClass
(
'
active
'
)
$active
.
removeClass
([
'
active
'
,
direction
].
join
(
'
'
))
$active
.
removeClass
([
'
active
'
,
direction
].
join
(
'
'
))
that
.
sliding
=
false
that
.
sliding
=
false
setTimeout
(
function
()
{
that
.
$element
.
trigger
(
'
slid.bs.carousel
'
)
},
0
)
setTimeout
(
function
()
{
that
.
$element
.
trigger
(
'
slid.bs.carousel
'
)
},
0
)
// yes, "slid". not a typo. past tense of "to slide".
})
})
.
emulateTransitionEnd
(
$active
.
css
(
'
transition-duration
'
).
slice
(
0
,
-
1
)
*
1000
)
.
emulateTransitionEnd
(
$active
.
css
(
'
transition-duration
'
).
slice
(
0
,
-
1
)
*
1000
)
}
else
{
}
else
{
$active
.
removeClass
(
'
active
'
)
$active
.
removeClass
(
'
active
'
)
$next
.
addClass
(
'
active
'
)
$next
.
addClass
(
'
active
'
)
this
.
sliding
=
false
this
.
sliding
=
false
this
.
$element
.
trigger
(
'
slid.bs.carousel
'
)
this
.
$element
.
trigger
(
'
slid.bs.carousel
'
)
// yes, "slid". not a typo. past tense of "to slide".
}
}
isCycling
&&
this
.
cycle
()
isCycling
&&
this
.
cycle
()
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/raw-files.min.js
+
1
-
1
View file @
8c95ff74
This diff is collapsed.
Click to expand it.
test-infra/npm-shrinkwrap.canonical.json
+
1
-
1
View file @
8c95ff74
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