diff options
| author | Jacob <[email protected]> | 2014-10-02 20:09:20 -0700 |
|---|---|---|
| committer | Jacob <[email protected]> | 2014-10-02 20:09:20 -0700 |
| commit | b702889613295c8d257a3ea2c945a9fbae3973fb (patch) | |
| tree | 792d363c95fb13938cad406eed8474b46291e006 /js/carousel.js | |
| parent | 64a74e93547da1784240e1172fcaf4cff4385e4b (diff) | |
| parent | c37c1a67438b3c682bac3787069eb33fefa6f154 (diff) | |
| download | bootstrap-b702889613295c8d257a3ea2c945a9fbae3973fb.tar.xz bootstrap-b702889613295c8d257a3ea2c945a9fbae3973fb.zip | |
Merge pull request #14626 from twbs/carousel-pause-hover-non-mobile
Only enable `pause: hover` for non-touch browsers
Diffstat (limited to 'js/carousel.js')
| -rw-r--r-- | js/carousel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/carousel.js b/js/carousel.js index 65cc7b912..4c9a1165c 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -23,7 +23,7 @@ this.$active = this.$items = null - this.options.pause == 'hover' && this.$element + 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)) } |