diff options
| author | Jacob Thornton <[email protected]> | 2012-02-24 21:51:39 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-24 21:51:39 -0800 |
| commit | fb74018ae293588db84c6fbf2f4f07aa4da21c5e (patch) | |
| tree | 5f3679116ba93be92760f0072135c34a2de384fd /docs/assets | |
| parent | 74a3c763b47e146e354624cea56b73fbf514ad97 (diff) | |
| download | bootstrap-fb74018ae293588db84c6fbf2f4f07aa4da21c5e.tar.xz bootstrap-fb74018ae293588db84c6fbf2f4f07aa4da21c5e.zip | |
and pause on hover option to carousel
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 54489 -> 54565 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-carousel.js | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 536db0ebf..fd5b621d7 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index aef98fb05..e0091a7d0 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -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 = { @@ -136,6 +139,7 @@ $.fn.carousel.defaults = { interval: 5000 + , pause: 'hover' } $.fn.carousel.Constructor = Carousel |