aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-02-20 22:02:04 -0800
committerJacob Thornton <[email protected]>2012-02-20 22:02:04 -0800
commitd149a131c14bb8be32ecc306f2128dddec9e83bf (patch)
treec3ab00fb5874b758f4ed8f6b39b764a01bfc4c7f /docs/assets
parentf046c12bd21b03d9b34e7e5f6386f7f4b614eace (diff)
downloadbootstrap-d149a131c14bb8be32ecc306f2128dddec9e83bf.tar.xz
bootstrap-d149a131c14bb8be32ecc306f2128dddec9e83bf.zip
remake
Diffstat (limited to 'docs/assets')
-rw-r--r--docs/assets/bootstrap.zipbin53662 -> 53665 bytes
-rw-r--r--docs/assets/js/bootstrap-carousel.js4
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 976400909..f23ad0bdf 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js
index 810256e80..aef98fb05 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')