]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fixes #8134
authorJacob Thornton <jacobthornton@gmail.com>
Wed, 24 Jul 2013 01:54:00 +0000 (18:54 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Wed, 24 Jul 2013 01:54:00 +0000 (18:54 -0700)
js/carousel.js

index 4def0cec283897e09347973cf118828b454b0448..2e5d978535ff6c2d3241da636ee63cf9b8bb94e0 100644 (file)
     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)))