Skip to content

B
bootstrap
Commit 422d04cb authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

simplify transition plugin a little

parent 30b3f47e
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 40 deletions
docs/assets/js/bootstrap-transition.js
View file @ 422d04cb
...@@ -29,12 +29,8 @@ ...@@ -29,12 +29,8 @@
$.support.transition = (function () { $.support.transition = (function () {
var thisBody = document.body || document.documentElement var transitionEnd = (function () {
, thisStyle = thisBody.style
, support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined
return support && {
end: (function () {
var el = document.createElement('bootstrap') var el = document.createElement('bootstrap')
, transEndEventNames = { , transEndEventNames = {
'WebkitTransition' : 'webkitTransitionEnd' 'WebkitTransition' : 'webkitTransitionEnd'
...@@ -51,9 +47,12 @@ ...@@ -51,9 +47,12 @@
} }
} }
}()) })()
return transitionEnd && {
end: transitionEnd
} }
})() })()
}) })
......
js/bootstrap-transition.js
View file @ 422d04cb
...@@ -29,12 +29,8 @@ ...@@ -29,12 +29,8 @@
$.support.transition = (function () { $.support.transition = (function () {
var thisBody = document.body || document.documentElement var transitionEnd = (function () {
, thisStyle = thisBody.style
, support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined
return support && {
end: (function () {
var el = document.createElement('bootstrap') var el = document.createElement('bootstrap')
, transEndEventNames = { , transEndEventNames = {
'WebkitTransition' : 'webkitTransitionEnd' 'WebkitTransition' : 'webkitTransitionEnd'
...@@ -51,9 +47,12 @@ ...@@ -51,9 +47,12 @@
} }
} }
}()) })()
return transitionEnd && {
end: transitionEnd
} }
})() })()
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment