diff options
Diffstat (limited to 'assets/js/bootstrap-carousel.js')
| -rwxr-xr-x | assets/js/bootstrap-carousel.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/assets/js/bootstrap-carousel.js b/assets/js/bootstrap-carousel.js index 2f47edb8..8c0723d2 100755 --- a/assets/js/bootstrap-carousel.js +++ b/assets/js/bootstrap-carousel.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-carousel.js v2.0.0 + * bootstrap-carousel.js v2.0.2 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. @@ -29,6 +29,9 @@ this.$element = $(element) this.options = $.extend({}, $.fn.carousel.defaults, options) this.options.slide && this.slide(this.options.slide) + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) } Carousel.prototype = { @@ -61,6 +64,7 @@ , pause: function () { clearInterval(this.interval) + this.interval = null return this } @@ -88,6 +92,8 @@ $next = $next.length ? $next : this.$element.find('.item')[fallback]() + if ($next.hasClass('active')) return + if (!$.support.transition && this.$element.hasClass('slide')) { this.$element.trigger('slide') $active.removeClass('active') @@ -133,6 +139,7 @@ $.fn.carousel.defaults = { interval: 5000 + , pause: 'hover' } $.fn.carousel.Constructor = Carousel @@ -151,4 +158,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery );
\ No newline at end of file |