diff options
| author | fat <[email protected]> | 2013-05-27 12:45:13 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-05-27 12:45:13 -0700 |
| commit | 9257bdc0974beef0a2218c76851dc37f3cf9313a (patch) | |
| tree | 945f2f323e9891fa0228e7fd172e9f6d3977a46e /docs/assets/js/bootstrap.js | |
| parent | 7cbb1c0452a1d9904f7655aea78644def85b7f2e (diff) | |
| download | bootstrap-9257bdc0974beef0a2218c76851dc37f3cf9313a.tar.xz bootstrap-9257bdc0974beef0a2218c76851dc37f3cf9313a.zip | |
fixes #7163
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index b7082dc21..69b9b94ab 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -434,7 +434,7 @@ // ================= $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { - var $this = $(this), href + var $this = $(this), href var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 var options = $.extend({}, $target.data(), $this.data()) var slideIndex @@ -448,6 +448,13 @@ e.preventDefault() }) + $(window).on('load', function () { + $('[data-ride="carousel"]').each(function () { + var $carousel = $(this) + $carousel.carousel($carousel.data()) + }) + }) + }(window.jQuery); /* ======================================================================== * Bootstrap: collapse.js v3.0.0 @@ -1317,7 +1324,7 @@ Tooltip.prototype.toggle = function (e) { var self = e ? $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) : this - self.tip().hasClass('in') ? self.hide() : self.show() + self.tip().hasClass('in') ? self.leave(e) : self.enter(e) } Tooltip.prototype.destroy = function () { |