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
8bf48121
Commit
8bf48121
authored
Aug 01, 2014
by
Jacob
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14061 from hnrch02/fix-13656
Expose transition durations on plugin constructors; closes #13656
parents
948a7466
231744d6
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
11 deletions
+24
-11
js/alert.js
js/alert.js
+3
-1
js/carousel.js
js/carousel.js
+3
-1
js/collapse.js
js/collapse.js
+4
-2
js/modal.js
js/modal.js
+7
-4
js/tab.js
js/tab.js
+3
-1
js/tooltip.js
js/tooltip.js
+4
-2
No files found.
js/alert.js
View file @
8bf48121
...
@@ -20,6 +20,8 @@
...
@@ -20,6 +20,8 @@
Alert
.
VERSION
=
'
3.2.0
'
Alert
.
VERSION
=
'
3.2.0
'
Alert
.
TRANSITION_DURATION
=
150
Alert
.
prototype
.
close
=
function
(
e
)
{
Alert
.
prototype
.
close
=
function
(
e
)
{
var
$this
=
$
(
this
)
var
$this
=
$
(
this
)
var
selector
=
$this
.
attr
(
'
data-target
'
)
var
selector
=
$this
.
attr
(
'
data-target
'
)
...
@@ -51,7 +53,7 @@
...
@@ -51,7 +53,7 @@
$
.
support
.
transition
&&
$parent
.
hasClass
(
'
fade
'
)
?
$
.
support
.
transition
&&
$parent
.
hasClass
(
'
fade
'
)
?
$parent
$parent
.
one
(
'
bsTransitionEnd
'
,
removeElement
)
.
one
(
'
bsTransitionEnd
'
,
removeElement
)
.
emulateTransitionEnd
(
150
)
:
.
emulateTransitionEnd
(
Alert
.
TRANSITION_DURATION
)
:
removeElement
()
removeElement
()
}
}
...
...
js/carousel.js
View file @
8bf48121
...
@@ -30,6 +30,8 @@
...
@@ -30,6 +30,8 @@
Carousel
.
VERSION
=
'
3.2.0
'
Carousel
.
VERSION
=
'
3.2.0
'
Carousel
.
TRANSITION_DURATION
=
600
Carousel
.
DEFAULTS
=
{
Carousel
.
DEFAULTS
=
{
interval
:
5000
,
interval
:
5000
,
pause
:
'
hover
'
,
pause
:
'
hover
'
,
...
@@ -153,7 +155,7 @@
...
@@ -153,7 +155,7 @@
that
.
$element
.
trigger
(
slidEvent
)
that
.
$element
.
trigger
(
slidEvent
)
},
0
)
},
0
)
})
})
.
emulateTransitionEnd
(
$active
.
css
(
'
transition-duration
'
).
slice
(
0
,
-
1
)
*
1000
)
.
emulateTransitionEnd
(
Carousel
.
TRANSITION_DURATION
)
}
else
{
}
else
{
$active
.
removeClass
(
'
active
'
)
$active
.
removeClass
(
'
active
'
)
$next
.
addClass
(
'
active
'
)
$next
.
addClass
(
'
active
'
)
...
...
js/collapse.js
View file @
8bf48121
...
@@ -24,6 +24,8 @@
...
@@ -24,6 +24,8 @@
Collapse
.
VERSION
=
'
3.2.0
'
Collapse
.
VERSION
=
'
3.2.0
'
Collapse
.
TRANSITION_DURATION
=
350
Collapse
.
DEFAULTS
=
{
Collapse
.
DEFAULTS
=
{
toggle
:
true
toggle
:
true
}
}
...
@@ -72,7 +74,7 @@
...
@@ -72,7 +74,7 @@
this
.
$element
this
.
$element
.
one
(
'
bsTransitionEnd
'
,
$
.
proxy
(
complete
,
this
))
.
one
(
'
bsTransitionEnd
'
,
$
.
proxy
(
complete
,
this
))
.
emulateTransitionEnd
(
350
)[
dimension
](
this
.
$element
[
0
][
scrollSize
])
.
emulateTransitionEnd
(
Collapse
.
TRANSITION_DURATION
)[
dimension
](
this
.
$element
[
0
][
scrollSize
])
}
}
Collapse
.
prototype
.
hide
=
function
()
{
Collapse
.
prototype
.
hide
=
function
()
{
...
@@ -105,7 +107,7 @@
...
@@ -105,7 +107,7 @@
this
.
$element
this
.
$element
[
dimension
](
0
)
[
dimension
](
0
)
.
one
(
'
bsTransitionEnd
'
,
$
.
proxy
(
complete
,
this
))
.
one
(
'
bsTransitionEnd
'
,
$
.
proxy
(
complete
,
this
))
.
emulateTransitionEnd
(
350
)
.
emulateTransitionEnd
(
Collapse
.
TRANSITION_DURATION
)
}
}
Collapse
.
prototype
.
toggle
=
function
()
{
Collapse
.
prototype
.
toggle
=
function
()
{
...
...
js/modal.js
View file @
8bf48121
...
@@ -32,6 +32,9 @@
...
@@ -32,6 +32,9 @@
Modal
.
VERSION
=
'
3.2.0
'
Modal
.
VERSION
=
'
3.2.0
'
Modal
.
TRANSITION_DURATION
=
300
Modal
.
BACKDROP_TRANSITION_DURATION
=
150
Modal
.
DEFAULTS
=
{
Modal
.
DEFAULTS
=
{
backdrop
:
true
,
backdrop
:
true
,
keyboard
:
true
,
keyboard
:
true
,
...
@@ -88,7 +91,7 @@
...
@@ -88,7 +91,7 @@
.
one
(
'
bsTransitionEnd
'
,
function
()
{
.
one
(
'
bsTransitionEnd
'
,
function
()
{
that
.
$element
.
trigger
(
'
focus
'
).
trigger
(
e
)
that
.
$element
.
trigger
(
'
focus
'
).
trigger
(
e
)
})
})
.
emulateTransitionEnd
(
300
)
:
.
emulateTransitionEnd
(
Modal
.
TRANSITION_DURATION
)
:
that
.
$element
.
trigger
(
'
focus
'
).
trigger
(
e
)
that
.
$element
.
trigger
(
'
focus
'
).
trigger
(
e
)
})
})
}
}
...
@@ -119,7 +122,7 @@
...
@@ -119,7 +122,7 @@
$
.
support
.
transition
&&
this
.
$element
.
hasClass
(
'
fade
'
)
?
$
.
support
.
transition
&&
this
.
$element
.
hasClass
(
'
fade
'
)
?
this
.
$element
this
.
$element
.
one
(
'
bsTransitionEnd
'
,
$
.
proxy
(
this
.
hideModal
,
this
))
.
one
(
'
bsTransitionEnd
'
,
$
.
proxy
(
this
.
hideModal
,
this
))
.
emulateTransitionEnd
(
300
)
:
.
emulateTransitionEnd
(
Modal
.
TRANSITION_DURATION
)
:
this
.
hideModal
()
this
.
hideModal
()
}
}
...
@@ -182,7 +185,7 @@
...
@@ -182,7 +185,7 @@
doAnimate
?
doAnimate
?
this
.
$backdrop
this
.
$backdrop
.
one
(
'
bsTransitionEnd
'
,
callback
)
.
one
(
'
bsTransitionEnd
'
,
callback
)
.
emulateTransitionEnd
(
150
)
:
.
emulateTransitionEnd
(
Modal
.
BACKDROP_TRANSITION_DURATION
)
:
callback
()
callback
()
}
else
if
(
!
this
.
isShown
&&
this
.
$backdrop
)
{
}
else
if
(
!
this
.
isShown
&&
this
.
$backdrop
)
{
...
@@ -195,7 +198,7 @@
...
@@ -195,7 +198,7 @@
$
.
support
.
transition
&&
this
.
$element
.
hasClass
(
'
fade
'
)
?
$
.
support
.
transition
&&
this
.
$element
.
hasClass
(
'
fade
'
)
?
this
.
$backdrop
this
.
$backdrop
.
one
(
'
bsTransitionEnd
'
,
callbackRemove
)
.
one
(
'
bsTransitionEnd
'
,
callbackRemove
)
.
emulateTransitionEnd
(
150
)
:
.
emulateTransitionEnd
(
Modal
.
BACKDROP_TRANSITION_DURATION
)
:
callbackRemove
()
callbackRemove
()
}
else
if
(
callback
)
{
}
else
if
(
callback
)
{
...
...
js/tab.js
View file @
8bf48121
...
@@ -19,6 +19,8 @@
...
@@ -19,6 +19,8 @@
Tab
.
VERSION
=
'
3.2.0
'
Tab
.
VERSION
=
'
3.2.0
'
Tab
.
TRANSITION_DURATION
=
150
Tab
.
prototype
.
show
=
function
()
{
Tab
.
prototype
.
show
=
function
()
{
var
$this
=
this
.
element
var
$this
=
this
.
element
var
$ul
=
$this
.
closest
(
'
ul:not(.dropdown-menu)
'
)
var
$ul
=
$this
.
closest
(
'
ul:not(.dropdown-menu)
'
)
...
@@ -82,7 +84,7 @@
...
@@ -82,7 +84,7 @@
$active
.
length
&&
transition
?
$active
.
length
&&
transition
?
$active
$active
.
one
(
'
bsTransitionEnd
'
,
next
)
.
one
(
'
bsTransitionEnd
'
,
next
)
.
emulateTransitionEnd
(
150
)
:
.
emulateTransitionEnd
(
Tab
.
TRANSITION_DURATION
)
:
next
()
next
()
$active
.
removeClass
(
'
in
'
)
$active
.
removeClass
(
'
in
'
)
...
...
js/tooltip.js
View file @
8bf48121
...
@@ -27,6 +27,8 @@
...
@@ -27,6 +27,8 @@
Tooltip
.
VERSION
=
'
3.2.0
'
Tooltip
.
VERSION
=
'
3.2.0
'
Tooltip
.
TRANSITION_DURATION
=
150
Tooltip
.
DEFAULTS
=
{
Tooltip
.
DEFAULTS
=
{
animation
:
true
,
animation
:
true
,
placement
:
'
top
'
,
placement
:
'
top
'
,
...
@@ -207,7 +209,7 @@
...
@@ -207,7 +209,7 @@
$
.
support
.
transition
&&
this
.
$tip
.
hasClass
(
'
fade
'
)
?
$
.
support
.
transition
&&
this
.
$tip
.
hasClass
(
'
fade
'
)
?
$tip
$tip
.
one
(
'
bsTransitionEnd
'
,
complete
)
.
one
(
'
bsTransitionEnd
'
,
complete
)
.
emulateTransitionEnd
(
150
)
:
.
emulateTransitionEnd
(
Tooltip
.
TRANSITION_DURATION
)
:
complete
()
complete
()
}
}
}
}
...
@@ -295,7 +297,7 @@
...
@@ -295,7 +297,7 @@
$
.
support
.
transition
&&
this
.
$tip
.
hasClass
(
'
fade
'
)
?
$
.
support
.
transition
&&
this
.
$tip
.
hasClass
(
'
fade
'
)
?
$tip
$tip
.
one
(
'
bsTransitionEnd
'
,
complete
)
.
one
(
'
bsTransitionEnd
'
,
complete
)
.
emulateTransitionEnd
(
150
)
:
.
emulateTransitionEnd
(
Tooltip
.
TRANSITION_DURATION
)
:
complete
()
complete
()
this
.
hoverState
=
null
this
.
hoverState
=
null
...
...
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