aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorfat <[email protected]>2012-10-30 21:32:15 -0700
committerfat <[email protected]>2012-10-30 21:32:15 -0700
commit404e4d9e9a082d2b7a6dfa1aee13709173f8e822 (patch)
tree50bb28e6bc7014823ee4eb19b3a2fb03526809f0 /js
parentb5af762ef59e1fa97f4386f5feadb67aa5183fef (diff)
downloadbootstrap-404e4d9e9a082d2b7a6dfa1aee13709173f8e822.tar.xz
bootstrap-404e4d9e9a082d2b7a6dfa1aee13709173f8e822.zip
fix carousel and rebuild js
Diffstat (limited to 'js')
-rw-r--r--js/bootstrap-carousel.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index 601f7b50e..33aae1cee 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()
})