From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 21 Feb 2012 06:02:04 +0000 (-0800)
Subject: remake
X-Git-Tag: v2.0.2~123^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d149a131c14bb8be32ecc306f2128dddec9e83bf;p=thirdparty%2Fbootstrap.git

remake
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 9764009092..f23ad0bdf0 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js
index 810256e80a..aef98fb05a 100644
--- a/docs/assets/js/bootstrap-carousel.js
+++ b/docs/assets/js/bootstrap-carousel.js
@@ -83,14 +83,14 @@
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
 
-      if (!$next.length) return
-
       this.sliding = true
 
       isCycling && this.pause()
 
       $next = $next.length ? $next : this.$element.find('.item')[fallback]()
 
+      if ($next.hasClass('active')) return
+
       if (!$.support.transition && this.$element.hasClass('slide')) {
         this.$element.trigger('slide')
         $active.removeClass('active')