diff options
| author | Jacob Thornton <[email protected]> | 2012-03-29 13:51:23 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-03-29 13:51:23 -0700 |
| commit | 422d04cb2b59ced380c2fa6dcb637dab70a916a3 (patch) | |
| tree | 6f4ec2cd30fd31d2d7fa3e6773456ffe3c4f7263 | |
| parent | 30b3f47e31487b9f7db6a42ed633597c3f5e764c (diff) | |
| download | bootstrap-422d04cb2b59ced380c2fa6dcb637dab70a916a3.tar.xz bootstrap-422d04cb2b59ced380c2fa6dcb637dab70a916a3.zip | |
simplify transition plugin a little
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 56988 -> 56890 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-transition.js | 39 | ||||
| -rw-r--r-- | js/bootstrap-transition.js | 39 |
3 files changed, 38 insertions, 40 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 50e92b3e3..9b0207321 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index 028b03c84..b87d60071 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -29,31 +29,30 @@ $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , 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') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd' - , 'msTransition' : 'MsTransitionEnd' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] + var transitionEnd = (function () { + + var el = document.createElement('bootstrap') + , transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd' + , 'msTransition' : 'MsTransitionEnd' + , 'transition' : 'transitionend' } + , name + + for (name in transEndEventNames){ + if (el.style[name] !== undefined) { + return transEndEventNames[name] } + } - }()) + })() + return transitionEnd && { + end: transitionEnd } + })() }) diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 028b03c84..b87d60071 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -29,31 +29,30 @@ $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , 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') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd' - , 'msTransition' : 'MsTransitionEnd' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] + var transitionEnd = (function () { + + var el = document.createElement('bootstrap') + , transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd' + , 'msTransition' : 'MsTransitionEnd' + , 'transition' : 'transitionend' } + , name + + for (name in transEndEventNames){ + if (el.style[name] !== undefined) { + return transEndEventNames[name] } + } - }()) + })() + return transitionEnd && { + end: transitionEnd } + })() }) |