1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-11 16:14:04 +02:00
This commit is contained in:
Mark Otto
2017-04-21 23:58:09 -07:00
parent 638b97f19c
commit ba312c20a5
28 changed files with 155 additions and 47 deletions

2
js/dist/alert.js vendored
View File

@@ -180,4 +180,4 @@ var Alert = function ($) {
return Alert;
}(jQuery);
//# sourceMappingURL=alert.js.map
//# sourceMappingURL=alert.js.map

2
js/dist/button.js vendored
View File

@@ -168,4 +168,4 @@ var Button = function ($) {
return Button;
}(jQuery);
//# sourceMappingURL=button.js.map
//# sourceMappingURL=button.js.map

26
js/dist/carousel.js vendored
View File

@@ -28,6 +28,7 @@ var Carousel = function ($) {
var TRANSITION_DURATION = 600;
var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key
var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key
var TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch
var Default = {
interval: 5000,
@@ -58,6 +59,7 @@ var Carousel = function ($) {
KEYDOWN: 'keydown' + EVENT_KEY,
MOUSEENTER: 'mouseenter' + EVENT_KEY,
MOUSELEAVE: 'mouseleave' + EVENT_KEY,
TOUCHEND: 'touchend' + EVENT_KEY,
LOAD_DATA_API: 'load' + EVENT_KEY + DATA_API_KEY,
CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY
};
@@ -100,6 +102,8 @@ var Carousel = function ($) {
this._isPaused = false;
this._isSliding = false;
this.touchTimeout = null;
this._config = this._getConfig(config);
this._element = $(element)[0];
this._indicatorsElement = $(this._element).find(Selector.INDICATORS)[0];
@@ -219,12 +223,30 @@ var Carousel = function ($) {
});
}
if (this._config.pause === 'hover' && !('ontouchstart' in document.documentElement)) {
if (this._config.pause === 'hover') {
$(this._element).on(Event.MOUSEENTER, function (event) {
return _this2.pause(event);
}).on(Event.MOUSELEAVE, function (event) {
return _this2.cycle(event);
});
if ('ontouchstart' in document.documentElement) {
// if it's a touch-enabled device, mouseenter/leave are fired as
// part of the mouse compatibility events on first tap - the carousel
// would stop cycling until user tapped out of it;
// here, we listen for touchend, explicitly pause the carousel
// (as if it's the second time we tap on it, mouseenter compat event
// is NOT fired) and after a timeout (to allow for mouse compatibility
// events to fire) we explicitly restart cycling
$(this._element).on(Event.TOUCHEND, function () {
_this2.pause();
if (_this2.touchTimeout) {
clearTimeout(_this2.touchTimeout);
}
_this2.touchTimeout = setTimeout(function (event) {
return _this2.cycle(event);
}, TOUCHEVENT_COMPAT_WAIT + _this2._config.interval);
});
}
}
};
@@ -488,4 +510,4 @@ var Carousel = function ($) {
return Carousel;
}(jQuery);
//# sourceMappingURL=carousel.js.map
//# sourceMappingURL=carousel.js.map

File diff suppressed because one or more lines are too long

2
js/dist/collapse.js vendored
View File

@@ -352,4 +352,4 @@ var Collapse = function ($) {
return Collapse;
}(jQuery);
//# sourceMappingURL=collapse.js.map
//# sourceMappingURL=collapse.js.map

6
js/dist/dropdown.js vendored
View File

@@ -104,7 +104,7 @@ var Dropdown = function ($) {
// only needed because of broken event delegation on iOS
// https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
if ('ontouchstart' in document.documentElement && !$(parent).closest(Selector.NAVBAR_NAV).length) {
$('body').children().on('mouseover', '*', $.noop);
$('body').children().on('mouseover', null, $.noop);
}
this.focus();
@@ -178,7 +178,7 @@ var Dropdown = function ($) {
// if this is a touch-enabled device we remove the extra
// empty mouseover listeners we added for iOS support
if ('ontouchstart' in document.documentElement) {
$('body').children().off('mouseover', '*', $.noop);
$('body').children().off('mouseover', null, $.noop);
}
toggles[i].setAttribute('aria-expanded', 'false');
@@ -284,4 +284,4 @@ var Dropdown = function ($) {
return Dropdown;
}(jQuery);
//# sourceMappingURL=dropdown.js.map
//# sourceMappingURL=dropdown.js.map

File diff suppressed because one or more lines are too long

2
js/dist/modal.js vendored
View File

@@ -574,4 +574,4 @@ var Modal = function ($) {
return Modal;
}(jQuery);
//# sourceMappingURL=modal.js.map
//# sourceMappingURL=modal.js.map

2
js/dist/popover.js vendored
View File

@@ -190,4 +190,4 @@ var Popover = function ($) {
return Popover;
}(jQuery);
//# sourceMappingURL=popover.js.map
//# sourceMappingURL=popover.js.map

View File

@@ -317,4 +317,4 @@ var ScrollSpy = function ($) {
return ScrollSpy;
}(jQuery);
//# sourceMappingURL=scrollspy.js.map
//# sourceMappingURL=scrollspy.js.map

2
js/dist/tab.js vendored
View File

@@ -251,4 +251,4 @@ var Tab = function ($) {
return Tab;
}(jQuery);
//# sourceMappingURL=tab.js.map
//# sourceMappingURL=tab.js.map

16
js/dist/tooltip.js vendored
View File

@@ -264,6 +264,14 @@ var Tooltip = function ($) {
$(tip).addClass(ClassName.SHOW);
// if this is a touch-enabled device we add extra
// empty mouseover listeners to the body's immediate children;
// only needed because of broken event delegation on iOS
// https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
if ('ontouchstart' in document.documentElement) {
$('body').children().on('mouseover', null, $.noop);
}
var complete = function complete() {
var prevHoverState = _this._hoverState;
_this._hoverState = null;
@@ -312,6 +320,12 @@ var Tooltip = function ($) {
$(tip).removeClass(ClassName.SHOW);
// if this is a touch-enabled device we remove the extra
// empty mouseover listeners we added for iOS support
if ('ontouchstart' in document.documentElement) {
$('body').children().off('mouseover', null, $.noop);
}
this._activeTrigger[Trigger.CLICK] = false;
this._activeTrigger[Trigger.FOCUS] = false;
this._activeTrigger[Trigger.HOVER] = false;
@@ -632,4 +646,4 @@ var Tooltip = function ($) {
return Tooltip;
}(jQuery); /* global Tether */
//# sourceMappingURL=tooltip.js.map
//# sourceMappingURL=tooltip.js.map

File diff suppressed because one or more lines are too long

2
js/dist/util.js vendored
View File

@@ -150,4 +150,4 @@ var Util = function ($) {
return Util;
}(jQuery);
//# sourceMappingURL=util.js.map
//# sourceMappingURL=util.js.map