From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 29 Mar 2012 20:51:23 +0000 (-0700)
Subject: simplify transition plugin a little
X-Git-Tag: v2.0.3~5^2~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=422d04cb2b59ced380c2fa6dcb637dab70a916a3;p=thirdparty%2Fbootstrap.git

simplify transition plugin a little
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 50e92b3e34..9b02073217 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js
index 028b03c848..b87d600713 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 028b03c848..b87d600713 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
       }
+
     })()
 
   })