aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2013-07-23 18:54:00 -0700
committerJacob Thornton <[email protected]>2013-07-23 18:54:00 -0700
commit68e87183a0c2d82b0f62d6c9d79bb89311bb3409 (patch)
treed7984671348b21679f9b3e1ad2fda62f4254683f
parentf1009c19b31c24df871b97efa74e8e10791bb2c3 (diff)
downloadbootstrap-68e87183a0c2d82b0f62d6c9d79bb89311bb3409.tar.xz
bootstrap-68e87183a0c2d82b0f62d6c9d79bb89311bb3409.zip
fixes #8134
-rw-r--r--js/carousel.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/carousel.js b/js/carousel.js
index 4def0cec2..2e5d97853 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -162,7 +162,7 @@
return this.each(function () {
var $this = $(this)
var data = $this.data('bs.carousel')
- var options = $.extend({}, Carousel.DEFAULTS, typeof option == 'object' && option)
+ var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
var action = typeof option == 'string' ? option : options.slide
if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))