aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/js/bootstrap.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 /docs/assets/js/bootstrap.js
parentb5af762ef59e1fa97f4386f5feadb67aa5183fef (diff)
downloadbootstrap-404e4d9e9a082d2b7a6dfa1aee13709173f8e822.tar.xz
bootstrap-404e4d9e9a082d2b7a6dfa1aee13709173f8e822.zip
fix carousel and rebuild js
Diffstat (limited to 'docs/assets/js/bootstrap.js')
-rw-r--r--docs/assets/js/bootstrap.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js
index 5194dfd1b..208676853 100644
--- a/docs/assets/js/bootstrap.js
+++ b/docs/assets/js/bootstrap.js
@@ -407,7 +407,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()
})
@@ -670,7 +670,7 @@
function clearMenus() {
$(toggle).each(function () {
- getParent($(this)).removeClass("open")
+ getParent($(this)).removeClass('open')
})
}