diff options
| author | Heinrich Fenkart <[email protected]> | 2014-10-03 08:17:49 +0200 |
|---|---|---|
| committer | Heinrich Fenkart <[email protected]> | 2014-10-03 08:17:49 +0200 |
| commit | 5bb08c50fa866a05e657c5f912809ba98c10c1bb (patch) | |
| tree | 08518448b402315e5ddb131448ab87477d780a8f /docs/dist/js/bootstrap.js | |
| parent | 2c562d2386dc7beb87f9c78e5ae72e66d34258a6 (diff) | |
| download | bootstrap-5bb08c50fa866a05e657c5f912809ba98c10c1bb.tar.xz bootstrap-5bb08c50fa866a05e657c5f912809ba98c10c1bb.zip | |
grunt
Diffstat (limited to 'docs/dist/js/bootstrap.js')
| -rw-r--r-- | docs/dist/js/bootstrap.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index f863c624d..5c22883ee 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -292,7 +292,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re // ========================= 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 = @@ -301,6 +301,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re this.$active = this.$items = null + 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)) @@ -313,7 +315,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re Carousel.DEFAULTS = { interval: 5000, pause: 'hover', - wrap: true + wrap: true, + keyboard: true } Carousel.prototype.keydown = function (e) { |