From: Chris Rebert Date: Mon, 21 Apr 2014 20:16:57 +0000 (-0700) Subject: Add direction & relatedTarget properties to slid.bs.carousel event X-Git-Tag: v3.2.0~222^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d0a8e31a46e54bb180eadb2844d1e4a9c7c4e91;p=thirdparty%2Fbootstrap.git Add direction & relatedTarget properties to slid.bs.carousel event Fixes #13393 --- diff --git a/js/carousel.js b/js/carousel.js index 9f063aec04..14a379fbf1 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -103,7 +103,8 @@ if ($next.hasClass('active')) return this.sliding = false - var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) + var relatedTarget = $next[0] + var e = $.Event('slide.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) this.$element.trigger(e) if (e.isDefaultPrevented()) return @@ -119,6 +120,7 @@ }) } + var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid". not a typo. past tense of "to slide". if ($.support.transition && this.$element.hasClass('slide')) { $next.addClass(type) $next[0].offsetWidth // force reflow @@ -129,14 +131,14 @@ $next.removeClass([type, direction].join(' ')).addClass('active') $active.removeClass(['active', direction].join(' ')) that.sliding = false - setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) // yes, "slid". not a typo. past tense of "to slide". + setTimeout(function () { that.$element.trigger(slidEvent) }, 0) }) .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000) } else { $active.removeClass('active') $next.addClass('active') this.sliding = false - this.$element.trigger('slid.bs.carousel') // yes, "slid". not a typo. past tense of "to slide". + this.$element.trigger(slidEvent) } isCycling && this.cycle()