diff options
| author | Mark Otto <[email protected]> | 2013-05-16 20:32:37 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-16 20:32:37 -0700 |
| commit | 0f4b4acce1df7f2cdfc6e0ad6dca59480868bd8d (patch) | |
| tree | 55ffc7fe20fbbabbfb6b4cb9a6e6f8d7e94467cf /js/carousel.js | |
| parent | 8a3e98230544cd2197a57c6e9cb01e3ceeb7a678 (diff) | |
| parent | 2433a076acc4dc318d238fd78361130a92e0a341 (diff) | |
| download | bootstrap-0f4b4acce1df7f2cdfc6e0ad6dca59480868bd8d.tar.xz bootstrap-0f4b4acce1df7f2cdfc6e0ad6dca59480868bd8d.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'js/carousel.js')
| -rw-r--r-- | js/carousel.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/carousel.js b/js/carousel.js index 782f06a07..e0d74f81f 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -111,7 +111,7 @@ $next = $next.length ? $next : this.$element.find('.item')[fallback]() - var e = $.Event('bs:carousel:slide', { relatedTarget: $next[0], direction: direction }) + var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) if ($next.hasClass('active')) return @@ -159,11 +159,11 @@ $.fn.carousel = function (option) { return this.each(function () { var $this = $(this) - var data = $this.data('bs-carousel') + var data = $this.data('bs.carousel') var options = $.extend({}, Carousel.DEFAULTS, typeof option == 'object' && option) var action = typeof option == 'string' ? option : options.slide - if (!data) $this.data('bs-carousel', (data = new Carousel(this, options))) + if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) if (typeof option == 'number') data.to(option) else if (action) data[action]() else if (options.interval) data.pause().cycle() |