replace UA sniffing

1 files changed, 18 insertions, 11 deletions

diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js
index 8c82cc311f..7b0113484c 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
+
         }())
+
       }
     })()