diff options
| author | Jacob Thornton <[email protected]> | 2012-03-29 12:35:06 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-03-29 12:35:06 -0700 |
| commit | 8ea8c312ea631ec7f8c80ae8751da18e93094a4e (patch) | |
| tree | 1294a13172920632edc431208a2d0ad11f18162b | |
| parent | 2bbc9a1cb225ded877b9228ebf714ccb74f07c6d (diff) | |
| download | bootstrap-8ea8c312ea631ec7f8c80ae8751da18e93094a4e.tar.xz bootstrap-8ea8c312ea631ec7f8c80ae8751da18e93094a4e.zip | |
replace UA sniffing
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 56916 -> 57000 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-transition.js | 29 | ||||
| -rw-r--r-- | js/bootstrap-transition.js | 29 |
3 files changed, 36 insertions, 22 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 875d7d9f4..c4734bcd9 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 8c82cc311..7b0113484 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -24,28 +24,35 @@ "use strict" - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + /* CSS TRANSITION SUPPORT (technique from http://www.modernizr.com/) * ======================================================= */ $.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 transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.msie ) { - transitionEnd = "MSTransitionEnd" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" + 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 + }()) + } })() diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 8c82cc311..7b0113484 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -24,28 +24,35 @@ "use strict" - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + /* CSS TRANSITION SUPPORT (technique from http://www.modernizr.com/) * ======================================================= */ $.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 transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.msie ) { - transitionEnd = "MSTransitionEnd" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" + 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 + }()) + } })() |