mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 21:39:08 +02:00
Code Issues Releases Wiki Activity

grunt test-js, grunt dist-js now working

Browse Source
This commit is contained in:
fat
2015-05-12 16:52:54 -07:00
parent a58febf71a
commit ab1578465a
23 changed files with 3048 additions and 2122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/carousel.js
View File

@@ -139,7 +139,7 @@ const Carousel = (($) => {
if (this._config.interval && !this._isPaused) {
this._interval = setInterval(
this.next.bind(this), this._config.interval
$.proxy(this.next, this), this._config.interval
)
}
}
@@ -177,14 +177,14 @@ const Carousel = (($) => {
_addEventListeners() {
if (this._config.keyboard) {
$(this._element)
.on('keydown.bs.carousel', this._keydown.bind(this))
.on('keydown.bs.carousel', $.proxy(this._keydown, this))
}
if (this._config.pause == 'hover' &&
!('ontouchstart' in document.documentElement)) {
$(this._element)
.on('mouseenter.bs.carousel', this.pause.bind(this))
.on('mouseleave.bs.carousel', this.cycle.bind(this))
.on('mouseenter.bs.carousel', $.proxy(this.pause, this))
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}
}