Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markdotto@gmail.com>2017-03-26 21:26:31 +0300
committerMark Otto <markdotto@gmail.com>2017-03-26 21:26:31 +0300
commit4ab06ca4534da28858c013e765a9ad34f508e4d7 (patch)
tree5b083913dcf7f8b1e5133e7d7114b0f63e65bc91 /js/dist/carousel.js
parente20d744bdf6ea396ef6d29ab5c1976635d861b29 (diff)
grunt
Diffstat (limited to 'js/dist/carousel.js')
-rw-r--r--js/dist/carousel.js13
1 files changed, 10 insertions, 3 deletions
diff --git a/js/dist/carousel.js b/js/dist/carousel.js
index 6e4269245f..f7af6550e9 100644
--- a/js/dist/carousel.js
+++ b/js/dist/carousel.js
@@ -272,9 +272,13 @@ var Carousel = function ($) {
};
Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) {
+ var targetIndex = this._getItemIndex(relatedTarget);
+ var fromIndex = this._getItemIndex($(this._element).find(Selector.ACTIVE_ITEM)[0]);
var slideEvent = $.Event(Event.SLIDE, {
relatedTarget: relatedTarget,
- direction: eventDirectionName
+ direction: eventDirectionName,
+ from: fromIndex,
+ to: targetIndex
});
$(this._element).trigger(slideEvent);
@@ -298,8 +302,9 @@ var Carousel = function ($) {
var _this3 = this;
var activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0];
+ var activeElementIndex = this._getItemIndex(activeElement);
var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement);
-
+ var nextElementIndex = this._getItemIndex(nextElement);
var isCycling = Boolean(this._interval);
var directionalClassName = void 0;
@@ -341,7 +346,9 @@ var Carousel = function ($) {
var slidEvent = $.Event(Event.SLID, {
relatedTarget: nextElement,
- direction: eventDirectionName
+ direction: eventDirectionName,
+ from: activeElementIndex,
+ to: nextElementIndex
});
if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) {