aboutsummaryrefslogtreecommitdiff
path: root/js/carousel.js
diff options
context:
space:
mode:
authorfat <[email protected]>2013-05-16 20:19:51 -0700
committerfat <[email protected]>2013-05-16 20:19:51 -0700
commit140ef2320bbb96ad90b73a884d83198706affaf9 (patch)
tree4de562f3c4fa8d989de16ebe61fd07732109a9e5 /js/carousel.js
parent5ab72f76878a85f105702a24096268fea73fba2d (diff)
downloadbootstrap-140ef2320bbb96ad90b73a884d83198706affaf9.tar.xz
bootstrap-140ef2320bbb96ad90b73a884d83198706affaf9.zip
change namespace back to dot notation and someother js shizzle
Diffstat (limited to 'js/carousel.js')
-rw-r--r--js/carousel.js6
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()