diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-10-11 23:42:28 +0400 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-10-11 23:42:28 +0400 |
| commit | 90951edcc8933d417b44d5a07f02e2022a58fbf5 (patch) | |
| tree | abdf164c2e0d232e1a30ac44996de12b0059dc31 /assets/javascripts/bootstrap/carousel.js | |
| parent | a7ac2b104eb58cfc6f3c94d633be8ddece6f252f (diff) | |
rake convert
Diffstat (limited to 'assets/javascripts/bootstrap/carousel.js')
| -rw-r--r-- | assets/javascripts/bootstrap/carousel.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/assets/javascripts/bootstrap/carousel.js b/assets/javascripts/bootstrap/carousel.js index 65cc7b9..b688990 100644 --- a/assets/javascripts/bootstrap/carousel.js +++ b/assets/javascripts/bootstrap/carousel.js @@ -14,7 +14,7 @@ // ========================= var Carousel = function (element, options) { - this.$element = $(element).on('keydown.bs.carousel', $.proxy(this.keydown, this)) + this.$element = $(element) this.$indicators = this.$element.find('.carousel-indicators') this.options = options this.paused = @@ -23,7 +23,9 @@ this.$active = this.$items = null - this.options.pause == 'hover' && this.$element + this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this)) + + this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element .on('mouseenter.bs.carousel', $.proxy(this.pause, this)) .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) } @@ -35,7 +37,8 @@ Carousel.DEFAULTS = { interval: 5000, pause: 'hover', - wrap: true + wrap: true, + keyboard: true } Carousel.prototype.keydown = function (e) { |