Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

1 files changed, 27 insertions, 23 deletions

diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js
index aaaee4bd2..8f6e86e44 100644
--- a/js/bootstrap-transition.js
+++ b/js/bootstrap-transition.js
@@ -17,31 +17,35 @@
  * limitations under the License.
  * ========================================================== */
 
-$(function () {
+!function( $ ) {
 
-  "use strict"
+  $(function () {
 
-  /* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
-   * ======================================================= */
+    "use strict"
 
-  $.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
+    /* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
+     * ======================================================= */
 
-    return support && {
-      end: (function () {
-        var transitionEnd = "TransitionEnd"
-        if ( $.browser.webkit ) {
-        	transitionEnd = "webkitTransitionEnd"
-        } else if ( $.browser.mozilla ) {
-        	transitionEnd = "transitionend"
-        } else if ( $.browser.opera ) {
-        	transitionEnd = "oTransitionEnd"
-        }
-        return transitionEnd
-      }())
-    }
-  })()
+    $.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
 
-})
\ No newline at end of file
+      return support && {
+        end: (function () {
+          var transitionEnd = "TransitionEnd"
+          if ( $.browser.webkit ) {
+          	transitionEnd = "webkitTransitionEnd"
+          } else if ( $.browser.mozilla ) {
+          	transitionEnd = "transitionend"
+          } else if ( $.browser.opera ) {
+          	transitionEnd = "oTransitionEnd"
+          }
+          return transitionEnd
+        }())
+      }
+    })()
+
+  })
+  
+}( window.jQuery )
\ No newline at end of file