diff options
| author | fat <[email protected]> | 2015-05-12 16:52:54 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2015-05-12 16:52:54 -0700 |
| commit | ab1578465aee4a776412b48f16bfefca79381919 (patch) | |
| tree | 0766caa82a67cd6328273aa5f2a826c579d44d32 /js/dist/carousel.js | |
| parent | a58febf71a5eac2161ce2db08c7d723755ed1163 (diff) | |
| download | bootstrap-ab1578465aee4a776412b48f16bfefca79381919.tar.xz bootstrap-ab1578465aee4a776412b48f16bfefca79381919.zip | |
grunt test-js, grunt dist-js now working
Diffstat (limited to 'js/dist/carousel.js')
| -rw-r--r-- | js/dist/carousel.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/dist/carousel.js b/js/dist/carousel.js index b1ef4184f..0d78153be 100644 --- a/js/dist/carousel.js +++ b/js/dist/carousel.js @@ -133,7 +133,7 @@ var Carousel = (function ($) { } if (this._config.interval && !this._isPaused) { - this._interval = setInterval(this.next.bind(this), this._config.interval); + this._interval = setInterval($.proxy(this.next, this), this._config.interval); } } }, { @@ -173,11 +173,11 @@ var Carousel = (function ($) { value: function _addEventListeners() { if (this._config.keyboard) { - $(this._element).on('keydown.bs.carousel', this._keydown.bind(this)); + $(this._element).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)); + $(this._element).on('mouseenter.bs.carousel', $.proxy(this.pause, this)).on('mouseleave.bs.carousel', $.proxy(this.cycle, this)); } } }, { |