aboutsummaryrefslogtreecommitdiff
path: root/js/dist/carousel.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2019-07-23 23:13:50 -0700
committerXhmikosR <[email protected]>2019-07-24 09:13:50 +0300
commit114a0ee193ffe7869c8369f25ef4dcc44929fbf5 (patch)
tree15e6e79c2f1b06eff34de7fba10bab2ec5dd0070 /js/dist/carousel.js
parente101ba4989c1930206ac2a092246612bab105f8e (diff)
downloadbootstrap-114a0ee193ffe7869c8369f25ef4dcc44929fbf5.tar.xz
bootstrap-114a0ee193ffe7869c8369f25ef4dcc44929fbf5.zip
Rebuild the dist to pickup new utilities file (#29105)
Dist after adding new utils file
Diffstat (limited to 'js/dist/carousel.js')
-rw-r--r--js/dist/carousel.js55
1 files changed, 34 insertions, 21 deletions
diff --git a/js/dist/carousel.js b/js/dist/carousel.js
index a9db353c5..0bb249834 100644
--- a/js/dist/carousel.js
+++ b/js/dist/carousel.js
@@ -4,8 +4,8 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
(function (global, factory) {
- typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('./dom/data.js'), require('./dom/event-handler.js'), require('./dom/manipulator.js'), require('./dom/selector-engine.js')) :
- typeof define === 'function' && define.amd ? define(['./dom/data.js', './dom/event-handler.js', './dom/manipulator.js', './dom/selector-engine.js'], factory) :
+ typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('../dom/data.js'), require('../dom/event-handler.js'), require('../dom/manipulator.js'), require('../dom/selector-engine.js')) :
+ typeof define === 'function' && define.amd ? define(['../dom/data.js', '../dom/event-handler.js', '../dom/manipulator.js', '../dom/selector-engine.js'], factory) :
(global = global || self, global.Carousel = factory(global.Data, global.EventHandler, global.Manipulator, global.SelectorEngine));
}(this, function (Data, EventHandler, Manipulator, SelectorEngine) { 'use strict';
@@ -45,20 +45,35 @@
return obj;
}
- function _objectSpread(target) {
+ function ownKeys(object, enumerableOnly) {
+ var keys = Object.keys(object);
+
+ if (Object.getOwnPropertySymbols) {
+ var symbols = Object.getOwnPropertySymbols(object);
+ if (enumerableOnly) symbols = symbols.filter(function (sym) {
+ return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+ });
+ keys.push.apply(keys, symbols);
+ }
+
+ return keys;
+ }
+
+ function _objectSpread2(target) {
for (var i = 1; i < arguments.length; i++) {
var source = arguments[i] != null ? arguments[i] : {};
- var ownKeys = Object.keys(source);
- if (typeof Object.getOwnPropertySymbols === 'function') {
- ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
- return Object.getOwnPropertyDescriptor(source, sym).enumerable;
- }));
+ if (i % 2) {
+ ownKeys(source, true).forEach(function (key) {
+ _defineProperty(target, key, source[key]);
+ });
+ } else if (Object.getOwnPropertyDescriptors) {
+ Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+ } else {
+ ownKeys(source).forEach(function (key) {
+ Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+ });
}
-
- ownKeys.forEach(function (key) {
- _defineProperty(target, key, source[key]);
- });
}
return target;
@@ -388,7 +403,7 @@
;
_proto._getConfig = function _getConfig(config) {
- config = _objectSpread({}, Default, config);
+ config = _objectSpread2({}, Default, {}, config);
typeCheckConfig(NAME, config, DefaultType);
return config;
};
@@ -431,7 +446,7 @@
});
}
- if (this._config.touch) {
+ if (this._config.touch && this._touchSupported) {
this._addTouchEventListeners();
}
};
@@ -439,10 +454,6 @@
_proto._addTouchEventListeners = function _addTouchEventListeners() {
var _this3 = this;
- if (!this._touchSupported) {
- return;
- }
-
var start = function start(event) {
if (_this3._pointerEvent && PointerType[event.pointerType.toUpperCase()]) {
_this3.touchStartX = event.clientX;
@@ -691,10 +702,10 @@
Carousel._carouselInterface = function _carouselInterface(element, config) {
var data = Data.getData(element, DATA_KEY);
- var _config = _objectSpread({}, Default, Manipulator.getDataAttributes(element));
+ var _config = _objectSpread2({}, Default, {}, Manipulator.getDataAttributes(element));
if (typeof config === 'object') {
- _config = _objectSpread({}, _config, config);
+ _config = _objectSpread2({}, _config, {}, config);
}
var action = typeof config === 'string' ? config : _config.slide;
@@ -736,7 +747,7 @@
return;
}
- var config = _objectSpread({}, Manipulator.getDataAttributes(target), Manipulator.getDataAttributes(this));
+ var config = _objectSpread2({}, Manipulator.getDataAttributes(target), {}, Manipulator.getDataAttributes(this));
var slideIndex = this.getAttribute('data-slide-to');
@@ -793,6 +804,8 @@
* add .carousel to jQuery only if jQuery is present
*/
+ /* istanbul ignore if */
+
if (typeof jQuery !== 'undefined') {
var JQUERY_NO_CONFLICT = jQuery.fn[NAME];
jQuery.fn[NAME] = Carousel._jQueryInterface;