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
270316f1
Commit
270316f1
authored
Jul 29, 2013
by
liuyl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix transition end
parent
b1a1210f
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
dist/js/bootstrap.js
dist/js/bootstrap.js
+2
-2
dist/js/bootstrap.min.js
dist/js/bootstrap.min.js
+1
-1
js/transition.js
js/transition.js
+2
-2
No files found.
dist/js/bootstrap.js
View file @
270316f1
...
@@ -50,8 +50,8 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
...
@@ -50,8 +50,8 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
// http://blog.alexmaccaw.com/css-transitions
// http://blog.alexmaccaw.com/css-transitions
$
.
fn
.
emulateTransitionEnd
=
function
(
duration
)
{
$
.
fn
.
emulateTransitionEnd
=
function
(
duration
)
{
var
called
=
false
,
$el
=
this
var
called
=
false
,
$el
=
this
$
(
this
).
one
(
'
webkitTransitionEnd
'
,
function
()
{
called
=
true
})
$
(
this
).
one
(
$
.
support
.
transition
.
end
,
function
()
{
called
=
true
})
var
callback
=
function
()
{
if
(
!
called
)
$
(
$el
).
trigger
(
'
webkitTransitionEnd
'
)
}
var
callback
=
function
()
{
if
(
!
called
)
$
(
$el
).
trigger
(
$
.
support
.
transition
.
end
)
}
setTimeout
(
callback
,
duration
)
setTimeout
(
callback
,
duration
)
return
this
return
this
}
}
...
...
dist/js/bootstrap.min.js
View file @
270316f1
This diff is collapsed.
Click to expand it.
js/transition.js
View file @
270316f1
...
@@ -43,8 +43,8 @@
...
@@ -43,8 +43,8 @@
// http://blog.alexmaccaw.com/css-transitions
// http://blog.alexmaccaw.com/css-transitions
$
.
fn
.
emulateTransitionEnd
=
function
(
duration
)
{
$
.
fn
.
emulateTransitionEnd
=
function
(
duration
)
{
var
called
=
false
,
$el
=
this
var
called
=
false
,
$el
=
this
$
(
this
).
one
(
'
webkitTransitionEnd
'
,
function
()
{
called
=
true
})
$
(
this
).
one
(
$
.
support
.
transition
.
end
,
function
()
{
called
=
true
})
var
callback
=
function
()
{
if
(
!
called
)
$
(
$el
).
trigger
(
'
webkitTransitionEnd
'
)
}
var
callback
=
function
()
{
if
(
!
called
)
$
(
$el
).
trigger
(
$
.
support
.
transition
.
end
)
}
setTimeout
(
callback
,
duration
)
setTimeout
(
callback
,
duration
)
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