From: fat <jacobthornton@gmail.com>
Date: Thu, 20 Dec 2012 09:13:03 +0000 (-0800)
Subject: reset carousel in the case that it is reinstantiated twice
X-Git-Tag: v2.3.0^2~79^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5abe33f5d84e8b7357f50744a7ce7d4420745dd8;p=thirdparty%2Fbootstrap.git

reset carousel in the case that it is reinstantiated twice
---

diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index 6a1b21f370..4838a16847 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -164,7 +164,7 @@
       if (!data) $this.data('carousel', (data = new Carousel(this, options)))
       if (typeof option == 'number') data.to(option)
       else if (action) data[action]()
-      else if (options.interval) data.cycle()
+      else if (options.interval) data.pause().cycle()
     })
   }