From 404e4d9e9a082d2b7a6dfa1aee13709173f8e822 Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Tue, 30 Oct 2012 21:32:15 -0700
Subject: fix carousel and rebuild js

---
 js/bootstrap-carousel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index 601f7b50ef..33aae1ceed 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -168,7 +168,7 @@
   $(document).on('click.carousel.data-api', '[data-slide]', function (e) {
     var $this = $(this), href
       , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      , options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data())
+      , options = $.extend({}, $target.data(), $this.data())
     $target.carousel(options)
     e.preventDefault()
   })
-- 
cgit v1.2.3