diff options
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 1237 |
1 files changed, 580 insertions, 657 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 64d400721c..b4cada0162 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -3,7 +3,6 @@ * Copyright 2011-2017 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ - var bootstrap = (function (exports,$,Popper) { 'use strict'; @@ -18,30 +17,23 @@ Popper = Popper && Popper.hasOwnProperty('default') ? Popper['default'] : Popper */ var Util = function () { - /** * ------------------------------------------------------------------------ * Private TransitionEnd Helpers * ------------------------------------------------------------------------ */ - var transition = false; - var MAX_UID = 1000000; - var TransitionEndEvent = { WebkitTransition: 'webkitTransitionEnd', MozTransition: 'transitionend', OTransition: 'oTransitionEnd otransitionend', - transition: 'transitionend' + transition: 'transitionend' // shoutout AngusCroll (https://goo.gl/pxwQGp) - // shoutout AngusCroll (https://goo.gl/pxwQGp) - };function toType(obj) { - return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase(); - } + }; - function isElement(obj) { - return (obj[0] || obj).nodeType; + function toType(obj) { + return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase(); } function getSpecialTransitionEndEvent() { @@ -52,6 +44,7 @@ var Util = function () { if ($(event.target).is(this)) { return event.handleObj.handler.apply(this, arguments); // eslint-disable-line prefer-rest-params } + return undefined; // eslint-disable-line no-undefined } }; @@ -79,49 +72,45 @@ var Util = function () { var _this = this; var called = false; - $(this).one(Util.TRANSITION_END, function () { called = true; }); - setTimeout(function () { if (!called) { Util.triggerTransitionEnd(_this); } }, duration); - return this; } function setTransitionEndSupport() { transition = transitionEndTest(); - $.fn.emulateTransitionEnd = transitionEndEmulator; if (Util.supportsTransitionEnd()) { $.event.special[Util.TRANSITION_END] = getSpecialTransitionEndEvent(); } } - /** * -------------------------------------------------------------------------- * Public Util Api * -------------------------------------------------------------------------- */ - var Util = { + var Util = { TRANSITION_END: 'bsTransitionEnd', - getUID: function getUID(prefix) { do { // eslint-disable-next-line no-bitwise prefix += ~~(Math.random() * MAX_UID); // "~~" acts like a faster Math.floor() here } while (document.getElementById(prefix)); + return prefix; }, getSelectorFromElement: function getSelectorFromElement(element) { var selector = element.getAttribute('data-target'); + if (!selector || selector === '#') { selector = element.getAttribute('href') || ''; } @@ -142,82 +131,52 @@ var Util = function () { supportsTransitionEnd: function supportsTransitionEnd() { return Boolean(transition); }, + isElement: function isElement(obj) { + return (obj[0] || obj).nodeType; + }, typeCheckConfig: function typeCheckConfig(componentName, config, configTypes) { for (var property in configTypes) { if (Object.prototype.hasOwnProperty.call(configTypes, property)) { var expectedTypes = configTypes[property]; var value = config[property]; - var valueType = value && isElement(value) ? 'element' : toType(value); + var valueType = value && Util.isElement(value) ? 'element' : toType(value); if (!new RegExp(expectedTypes).test(valueType)) { - throw new Error(componentName.toUpperCase() + ': ' + ('Option "' + property + '" provided type "' + valueType + '" ') + ('but expected type "' + expectedTypes + '".')); + throw new Error(componentName.toUpperCase() + ": " + ("Option \"" + property + "\" provided type \"" + valueType + "\" ") + ("but expected type \"" + expectedTypes + "\".")); } } } } }; - setTransitionEndSupport(); - return Util; }(jQuery); -var babelHelpers = {}; -var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { - return typeof obj; -} : function (obj) { - return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; -}; - -var classCallCheck = function (instance, Constructor) { - if (!(instance instanceof Constructor)) { - throw new TypeError("Cannot call a class as a function"); - } -}; - -var createClass = function () { - function defineProperties(target, props) { - for (var i = 0; i < props.length; i++) { - var descriptor = props[i]; - descriptor.enumerable = descriptor.enumerable || false; - descriptor.configurable = true; - if ("value" in descriptor) descriptor.writable = true; - Object.defineProperty(target, descriptor.key, descriptor); - } - } - - return function (Constructor, protoProps, staticProps) { - if (protoProps) defineProperties(Constructor.prototype, protoProps); - if (staticProps) defineProperties(Constructor, staticProps); - return Constructor; - }; -}(); - -var inherits = function (subClass, superClass) { - if (typeof superClass !== "function" && superClass !== null) { - throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); +function _defineProperties(target, props) { + for (var i = 0; i < props.length; i++) { + var descriptor = props[i]; + descriptor.enumerable = descriptor.enumerable || false; + descriptor.configurable = true; + if ("value" in descriptor) descriptor.writable = true; + Object.defineProperty(target, descriptor.key, descriptor); } +} - subClass.prototype = Object.create(superClass && superClass.prototype, { - constructor: { - value: subClass, - enumerable: false, - writable: true, - configurable: true - } - }); - if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; -}; +function _createClass(Constructor, protoProps, staticProps) { + if (protoProps) _defineProperties(Constructor.prototype, protoProps); + if (staticProps) _defineProperties(Constructor, staticProps); + return Constructor; +} -var possibleConstructorReturn = function (self, call) { - if (!self) { - throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); - } +var createClass = _createClass; - return call && (typeof call === "object" || typeof call === "function") ? call : self; -}; +function _inheritsLoose(subClass, superClass) { + subClass.prototype = Object.create(superClass.prototype); + subClass.prototype.constructor = subClass; + subClass.__proto__ = superClass; +} -babelHelpers; +var inheritsLoose = _inheritsLoose; /** * -------------------------------------------------------------------------- @@ -227,36 +186,30 @@ babelHelpers; */ var Alert = function () { - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ */ - var NAME = 'alert'; var VERSION = '4.0.0-beta'; var DATA_KEY = 'bs.alert'; - var EVENT_KEY = '.' + DATA_KEY; + var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; - var Selector = { DISMISS: '[data-dismiss="alert"]' }; - var Event = { - CLOSE: 'close' + EVENT_KEY, - CLOSED: 'closed' + EVENT_KEY, - CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY + CLOSE: "close" + EVENT_KEY, + CLOSED: "closed" + EVENT_KEY, + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY }; - var ClassName = { ALERT: 'alert', FADE: 'fade', SHOW: 'show' - /** * ------------------------------------------------------------------------ * Class Definition @@ -264,21 +217,23 @@ var Alert = function () { */ }; - var Alert = function () { - function Alert(element) { - classCallCheck(this, Alert); + var Alert = + /*#__PURE__*/ + function () { + function Alert(element) { this._element = element; - } + } // getters - // getters - // public + var _proto = Alert.prototype; - Alert.prototype.close = function close(element) { + // public + _proto.close = function close(element) { element = element || this._element; var rootElement = this._getRootElement(element); + var customEvent = this._triggerCloseEvent(rootElement); if (customEvent.isDefaultPrevented()) { @@ -288,14 +243,13 @@ var Alert = function () { this._removeElement(rootElement); }; - Alert.prototype.dispose = function dispose() { + _proto.dispose = function dispose() { $.removeData(this._element, DATA_KEY); this._element = null; - }; + }; // private - // private - Alert.prototype._getRootElement = function _getRootElement(element) { + _proto._getRootElement = function _getRootElement(element) { var selector = Util.getSelectorFromElement(element); var parent = false; @@ -304,26 +258,26 @@ var Alert = function () { } if (!parent) { - parent = $(element).closest('.' + ClassName.ALERT)[0]; + parent = $(element).closest("." + ClassName.ALERT)[0]; } return parent; }; - Alert.prototype._triggerCloseEvent = function _triggerCloseEvent(element) { + _proto._triggerCloseEvent = function _triggerCloseEvent(element) { var closeEvent = $.Event(Event.CLOSE); - $(element).trigger(closeEvent); return closeEvent; }; - Alert.prototype._removeElement = function _removeElement(element) { + _proto._removeElement = function _removeElement(element) { var _this = this; $(element).removeClass(ClassName.SHOW); if (!Util.supportsTransitionEnd() || !$(element).hasClass(ClassName.FADE)) { this._destroyElement(element); + return; } @@ -332,11 +286,10 @@ var Alert = function () { }).emulateTransitionEnd(TRANSITION_DURATION); }; - Alert.prototype._destroyElement = function _destroyElement(element) { + _proto._destroyElement = function _destroyElement(element) { $(element).detach().trigger(Event.CLOSED).remove(); - }; + }; // static - // static Alert._jQueryInterface = function _jQueryInterface(config) { return this.each(function () { @@ -365,22 +318,21 @@ var Alert = function () { }; createClass(Alert, null, [{ - key: 'VERSION', + key: "VERSION", get: function get() { return VERSION; } }]); return Alert; }(); - /** * ------------------------------------------------------------------------ * Data Api implementation * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert())); + $(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert())); /** * ------------------------------------------------------------------------ * jQuery @@ -389,6 +341,7 @@ var Alert = function () { $.fn[NAME] = Alert._jQueryInterface; $.fn[NAME].Constructor = Alert; + $.fn[NAME].noConflict = function () { $.fn[NAME] = JQUERY_NO_CONFLICT; return Alert._jQueryInterface; @@ -405,26 +358,22 @@ var Alert = function () { */ var Button = function () { - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ */ - var NAME = 'button'; var VERSION = '4.0.0-beta'; var DATA_KEY = 'bs.button'; - var EVENT_KEY = '.' + DATA_KEY; + var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; - var ClassName = { ACTIVE: 'active', BUTTON: 'btn', FOCUS: 'focus' }; - var Selector = { DATA_TOGGLE_CARROT: '[data-toggle^="button"]', DATA_TOGGLE: '[data-toggle="buttons"]', @@ -432,11 +381,9 @@ var Button = function () { ACTIVE: '.active', BUTTON: '.btn' }; - var Event = { - CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY, - FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + DATA_API_KEY) - + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY, + FOCUS_BLUR_DATA_API: "focus" + EVENT_KEY + DATA_API_KEY + " " + ("blur" + EVENT_KEY + DATA_API_KEY) /** * ------------------------------------------------------------------------ * Class Definition @@ -444,18 +391,19 @@ var Button = function () { */ }; - var Button = function () { - function Button(element) { - classCallCheck(this, Button); + var Button = + /*#__PURE__*/ + function () { + function Button(element) { this._element = element; - } + } // getters - // getters - // public + var _proto = Button.prototype; - Button.prototype.toggle = function toggle() { + // public + _proto.toggle = function toggle() { var triggerChangeEvent = true; var addAriaPressed = true; var rootElement = $(this._element).closest(Selector.DATA_TOGGLE)[0]; @@ -480,6 +428,7 @@ var Button = function () { if (input.hasAttribute('disabled') || rootElement.hasAttribute('disabled') || input.classList.contains('disabled') || rootElement.classList.contains('disabled')) { return; } + input.checked = !$(this._element).hasClass(ClassName.ACTIVE); $(input).trigger('change'); } @@ -498,12 +447,11 @@ var Button = function () { } }; - Button.prototype.dispose = function dispose() { + _proto.dispose = function dispose() { $.removeData(this._element, DATA_KEY); this._element = null; - }; + }; // static - // static Button._jQueryInterface = function _jQueryInterface(config) { return this.each(function () { @@ -521,23 +469,22 @@ var Button = function () { }; createClass(Button, null, [{ - key: 'VERSION', + key: "VERSION", get: function get() { return VERSION; } }]); return Button; }(); - /** * ------------------------------------------------------------------------ * Data Api implementation * ------------------------------------------------------------------------ */ + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { event.preventDefault(); - var button = event.target; if (!$(button).hasClass(ClassName.BUTTON)) { @@ -549,7 +496,6 @@ var Button = function () { var button = $(event.target).closest(Selector.BUTTON)[0]; $(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type)); }); - /** * ------------------------------------------------------------------------ * jQuery @@ -558,6 +504,7 @@ var Button = function () { $.fn[NAME] = Button._jQueryInterface; $.fn[NAME].Constructor = Button; + $.fn[NAME].noConflict = function () { $.fn[NAME] = JQUERY_NO_CONFLICT; return Button._jQueryInterface; @@ -574,22 +521,22 @@ var Button = function () { */ var Carousel = function () { - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ */ - var NAME = 'carousel'; var VERSION = '4.0.0-beta'; var DATA_KEY = 'bs.carousel'; - var EVENT_KEY = '.' + DATA_KEY; + var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; 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 = { @@ -599,7 +546,6 @@ var Carousel = function () { pause: 'hover', wrap: true }; - var DefaultType = { interval: '(number|boolean)', keyboard: 'boolean', @@ -607,25 +553,22 @@ var Carousel = function () { pause: '(string|boolean)', wrap: 'boolean' }; - var Direction = { NEXT: 'next', PREV: 'prev', LEFT: 'left', RIGHT: 'right' }; - var Event = { - SLIDE: 'slide' + EVENT_KEY, - SLID: 'slid' + EVENT_KEY, - 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 + SLIDE: "slide" + EVENT_KEY, + SLID: "slid" + EVENT_KEY, + 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 }; - var ClassName = { CAROUSEL: 'carousel', ACTIVE: 'active', @@ -636,7 +579,6 @@ var Carousel = function () { PREV: 'carousel-item-prev', ITEM: 'carousel-item' }; - var Selector = { ACTIVE: '.active', ACTIVE_ITEM: '.active.carousel-item', @@ -645,7 +587,6 @@ var Carousel = function () { INDICATORS: '.carousel-indicators', DATA_SLIDE: '[data-slide], [data-slide-to]', DATA_RIDE: '[data-ride="carousel"]' - /** * ------------------------------------------------------------------------ * Class Definition @@ -653,37 +594,35 @@ var Carousel = function () { */ }; - var Carousel = function () { - function Carousel(element, config) { - classCallCheck(this, Carousel); + var Carousel = + /*#__PURE__*/ + function () { + function Carousel(element, config) { this._items = null; this._interval = null; this._activeElement = null; - 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]; this._addEventListeners(); - } + } // getters - // getters - // public + var _proto = Carousel.prototype; - Carousel.prototype.next = function next() { + // public + _proto.next = function next() { if (!this._isSliding) { this._slide(Direction.NEXT); } }; - Carousel.prototype.nextWhenVisible = function nextWhenVisible() { + _proto.nextWhenVisible = function nextWhenVisible() { // Don't call next when the page isn't visible // or the carousel or its parent isn't visible if (!document.hidden && $(this._element).is(':visible') && $(this._element).css('visibility') !== 'hidden') { @@ -691,13 +630,13 @@ var Carousel = function () { } }; - Carousel.prototype.prev = function prev() { + _proto.prev = function prev() { if (!this._isSliding) { this._slide(Direction.PREV); } }; - Carousel.prototype.pause = function pause(event) { + _proto.pause = function pause(event) { if (!event) { this._isPaused = true; } @@ -711,7 +650,7 @@ var Carousel = function () { this._interval = null; }; - Carousel.prototype.cycle = function cycle(event) { + _proto.cycle = function cycle(event) { if (!event) { this._isPaused = false; } @@ -726,7 +665,7 @@ var Carousel = function () { } }; - Carousel.prototype.to = function to(index) { + _proto.to = function to(index) { var _this = this; this._activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0]; @@ -755,10 +694,9 @@ var Carousel = function () { this._slide(direction, this._items[index]); }; - Carousel.prototype.dispose = function dispose() { + _proto.dispose = function dispose() { $(this._element).off(EVENT_KEY); $.removeData(this._element, DATA_KEY); - this._items = null; this._config = null; this._element = null; @@ -767,17 +705,16 @@ var Carousel = function () { this._isSliding = null; this._activeElement = null; this._indicatorsElement = null; - }; + }; // private - // private - Carousel.prototype._getConfig = function _getConfig(config) { + _proto._getConfig = function _getConfig(config) { config = $.extend({}, Default, config); Util.typeCheckConfig(NAME, config, DefaultType); return config; }; - Carousel.prototype._addEventListeners = function _addEventListeners() { + _proto._addEventListeners = function _addEventListeners() { var _this2 = this; if (this._config.keyboard) { @@ -792,6 +729,7 @@ var Carousel = function () { }).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 @@ -802,9 +740,11 @@ var Carousel = function () { // 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); @@ -813,7 +753,7 @@ var Carousel = function () { } }; - Carousel.prototype._keydown = function _keydown(event) { + _proto._keydown = function _keydown(event) { if (/input|textarea/i.test(event.target.tagName)) { return; } @@ -823,24 +763,28 @@ var Carousel = function () { event.preventDefault(); this.prev(); break; + case ARROW_RIGHT_KEYCODE: event.preventDefault(); this.next(); break; + default: return; } }; - Carousel.prototype._getItemIndex = function _getItemIndex(element) { + _proto._getItemIndex = function _getItemIndex(element) { this._items = $.makeArray($(element).parent().find(Selector.ITEM)); return this._items.indexOf(element); }; - Carousel.prototype._getItemByDirection = function _getItemByDirection(direction, activeElement) { + _proto._getItemByDirection = function _getItemByDirection(direction, activeElement) { var isNextDirection = direction === Direction.NEXT; var isPrevDirection = direction === Direction.PREV; + var activeIndex = this._getItemIndex(activeElement); + var lastItemIndex = this._items.length - 1; var isGoingToWrap = isPrevDirection && activeIndex === 0 || isNextDirection && activeIndex === lastItemIndex; @@ -850,26 +794,25 @@ var Carousel = function () { var delta = direction === Direction.PREV ? -1 : 1; var itemIndex = (activeIndex + delta) % this._items.length; - return itemIndex === -1 ? this._items[this._items.length - 1] : this._items[itemIndex]; }; - Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) { + _proto._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, from: fromIndex, to: targetIndex }); - $(this._element).trigger(slideEvent); - return slideEvent; }; - Carousel.prototype._setActiveIndicatorElement = function _setActiveIndicatorElement(element) { + _proto._setActiveIndicatorElement = function _setActiveIndicatorElement(element) { if (this._indicatorsElement) { $(this._indicatorsElement).find(Selector.ACTIVE).removeClass(ClassName.ACTIVE); @@ -881,18 +824,21 @@ var Carousel = function () { } }; - Carousel.prototype._slide = function _slide(direction, element) { + _proto._slide = function _slide(direction, element) { 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; - var orderClassName = void 0; - var eventDirectionName = void 0; + var isCycling = Boolean(this._interval); + var directionalClassName; + var orderClassName; + var eventDirectionName; if (direction === Direction.NEXT) { directionalClassName = ClassName.LEFT; @@ -910,6 +856,7 @@ var Carousel = function () { } var slideEvent = this._triggerSlideEvent(nextElement, eventDirectionName); + if (slideEvent.isDefaultPrevented()) { return; } @@ -935,21 +882,14 @@ var Carousel = function () { }); if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) { - $(nextElement).addClass(orderClassName); - Util.reflow(nextElement); - $(activeElement).addClass(directionalClassName); $(nextElement).addClass(directionalClassName); - $(activeElement).one(Util.TRANSITION_END, function () { - $(nextElement).removeClass(directionalClassName + ' ' + orderClassName).addClass(ClassName.ACTIVE); - - $(activeElement).removeClass(ClassName.ACTIVE + ' ' + orderClassName + ' ' + directionalClassName); - + $(nextElement).removeClass(directionalClassName + " " + orderClassName).addClass(ClassName.ACTIVE); + $(activeElement).removeClass(ClassName.ACTIVE + " " + orderClassName + " " + directionalClassName); _this3._isSliding = false; - setTimeout(function () { return $(_this3._element).trigger(slidEvent); }, 0); @@ -957,7 +897,6 @@ var Carousel = function () { } else { $(activeElement).removeClass(ClassName.ACTIVE); $(nextElement).addClass(ClassName.ACTIVE); - this._isSliding = false; $(this._element).trigger(slidEvent); } @@ -965,16 +904,16 @@ var Carousel = function () { if (isCycling) { this.cycle(); } - }; + }; // static - // static Carousel._jQueryInterface = function _jQueryInterface(config) { return this.each(function () { var data = $(this).data(DATA_KEY); + var _config = $.extend({}, Default, $(this).data()); - if ((typeof config === 'undefined' ? 'undefined' : _typeof(config)) === 'object') { + if (typeof config === 'object') { $.extend(_config, config); } @@ -989,8 +928,9 @@ var Carousel = function () { data.to(config); } else if (typeof action === 'string') { if (typeof data[action] === 'undefined') { - throw new Error('No method named "' + action + '"'); + throw new Error("No method named \"" + action + "\""); } + data[action](); } else if (_config.interval) { data.pause(); @@ -1029,34 +969,33 @@ var Carousel = function () { }; createClass(Carousel, null, [{ - key: 'VERSION', + key: "VERSION", get: function get() { return VERSION; } }, { - key: 'Default', + key: "Default", get: function get() { return Default; } }]); return Carousel; }(); - /** * ------------------------------------------------------------------------ * Data Api implementation * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK_DATA_API, Selector.DATA_SLIDE, Carousel._dataApiClickHandler); + $(document).on(Event.CLICK_DATA_API, Selector.DATA_SLIDE, Carousel._dataApiClickHandler); $(window).on(Event.LOAD_DATA_API, function () { $(Selector.DATA_RIDE).each(function () { var $carousel = $(this); + Carousel._jQueryInterface.call($carousel, $carousel.data()); }); }); - /** * ------------------------------------------------------------------------ * jQuery @@ -1065,6 +1004,7 @@ var Carousel = function () { $.fn[NAME] = Carousel._jQueryInterface; $.fn[NAME].Constructor = Carousel; + $.fn[NAME].noConflict = function () { $.fn[NAME] = JQUERY_NO_CONFLICT; return Carousel._jQueryInterface; @@ -1081,55 +1021,46 @@ var Carousel = function () { */ var Collapse = function () { - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ */ - var NAME = 'collapse'; var VERSION = '4.0.0-beta'; var DATA_KEY = 'bs.collapse'; - var EVENT_KEY = '.' + DATA_KEY; + var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 600; - var Default = { toggle: true, parent: '' }; - var DefaultType = { toggle: 'boolean', - parent: 'string' + parent: '(string|element)' }; - var Event = { - SHOW: 'show' + EVENT_KEY, - SHOWN: 'shown' + EVENT_KEY, - HIDE: 'hide' + EVENT_KEY, - HIDDEN: 'hidden' + EVENT_KEY, - CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY + SHOW: "show" + EVENT_KEY, + SHOWN: "shown" + EVENT_KEY, + HIDE: "hide" + EVENT_KEY, + HIDDEN: "hidden" + EVENT_KEY, + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY }; - var ClassName = { SHOW: 'show', COLLAPSE: 'collapse', COLLAPSING: 'collapsing', COLLAPSED: 'collapsed' }; - var Dimension = { WIDTH: 'width', HEIGHT: 'height' }; - var Selector = { ACTIVES: '.show, .collapsing', DATA_TOGGLE: '[data-toggle="collapse"]' - /** * ------------------------------------------------------------------------ * Class Definition @@ -1137,18 +1068,21 @@ var Collapse = function () { */ }; - var Collapse = function () { - function Collapse(element, config) { - classCallCheck(this, Collapse); + var Collapse = + /*#__PURE__*/ + function () { + function Collapse(element, config) { this._isTransitioning = false; this._element = element; this._config = this._getConfig(config); - this._triggerArray = $.makeArray($('[data-toggle="collapse"][href="#' + element.id + '"],' + ('[data-toggle="collapse"][data-target="#' + element.id + '"]'))); + this._triggerArray = $.makeArray($("[data-toggle=\"collapse\"][href=\"#" + element.id + "\"]," + ("[data-toggle=\"collapse\"][data-target=\"#" + element.id + "\"]"))); var tabToggles = $(Selector.DATA_TOGGLE); + for (var i = 0; i < tabToggles.length; i++) { var elem = tabToggles[i]; var selector = Util.getSelectorFromElement(elem); + if (selector !== null && $(selector).filter(element).length > 0) { this._triggerArray.push(elem); } @@ -1163,13 +1097,13 @@ var Collapse = function () { if (this._config.toggle) { this.toggle(); } - } + } // getters - // getters - // public + var _proto = Collapse.prototype; - Collapse.prototype.toggle = function toggle() { + // public + _proto.toggle = function toggle() { if ($(this._element).hasClass(ClassName.SHOW)) { this.hide(); } else { @@ -1177,18 +1111,19 @@ var Collapse = function () { } }; - Collapse.prototype.show = function show() { + _proto.show = function show() { var _this = this; if (this._isTransitioning || $(this._element).hasClass(ClassName.SHOW)) { return; } - var actives = void 0; - var activesData = void 0; + var actives; + var activesData; if (this._parent) { actives = $.makeArray($(this._parent).children().children(Selector.ACTIVES)); + if (!actives.length) { actives = null; } @@ -1196,6 +1131,7 @@ var Collapse = function () { if (actives) { activesData = $(actives).data(DATA_KEY); + if (activesData && activesData._isTransitioning) { return; } @@ -1203,12 +1139,14 @@ var Collapse = function () { var startEvent = $.Event(Event.SHOW); $(this._element).trigger(startEvent); + if (startEvent.isDefaultPrevented()) { return; } if (actives) { Collapse._jQueryInterface.call($(actives), 'hide'); + if (!activesData) { $(actives).data(DATA_KEY, null); } @@ -1217,7 +1155,6 @@ var Collapse = function () { var dimension = this._getDimension(); $(this._element).removeClass(ClassName.COLLAPSE).addClass(ClassName.COLLAPSING); - this._element.style[dimension] = 0; if (this._triggerArray.length) { @@ -1228,7 +1165,6 @@ var Collapse = function () { var complete = function complete() { $(_this._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).addClass(ClassName.SHOW); - _this._element.style[dimension] = ''; _this.setTransitioning(false); @@ -1242,14 +1178,12 @@ var Collapse = function () { } var capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1); - var scrollSize = 'scroll' + capitalizedDimension; - + var scrollSize = "scroll" + capitalizedDimension; $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION); - - this._element.style[dimension] = this._element[scrollSize] + 'px'; + this._element.style[dimension] = this._element[scrollSize] + "px"; }; - Collapse.prototype.hide = function hide() { + _proto.hide = function hide() { var _this2 = this; if (this._isTransitioning || !$(this._element).hasClass(ClassName.SHOW)) { @@ -1258,24 +1192,25 @@ var Collapse = function () { var startEvent = $.Event(Event.HIDE); $(this._element).trigger(startEvent); + if (startEvent.isDefaultPrevented()) { return; } var dimension = this._getDimension(); - this._element.style[dimension] = this._element.getBoundingClientRect()[dimension] + 'px'; - + this._element.style[dimension] = this._element.getBoundingClientRect()[dimension] + "px"; Util.reflow(this._element); - $(this._element).addClass(ClassName.COLLAPSING).removeClass(ClassName.COLLAPSE).removeClass(ClassName.SHOW); if (this._triggerArray.length) { for (var i = 0; i < this._triggerArray.length; i++) { var trigger = this._triggerArray[i]; var selector = Util.getSelectorFromElement(trigger); + if (selector !== null) { var $elem = $(selector); + if (!$elem.hasClass(ClassName.SHOW)) { $(trigger).addClass(ClassName.COLLAPSED).attr('aria-expanded', false); } @@ -1287,6 +1222,7 @@ var Collapse = function () { var complete = function complete() { _this2.setTransitioning(false); + $(_this2._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).trigger(Event.HIDDEN); }; @@ -1300,48 +1236,56 @@ var Collapse = function () { $(this._element).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION); }; - Collapse.prototype.setTransitioning = function setTransitioning(isTransitioning) { + _proto.setTransitioning = function setTransitioning(isTransitioning) { this._isTransitioning = isTransitioning; }; - Collapse.prototype.dispose = function dispose() { + _proto.dispose = function dispose() { $.removeData(this._element, DATA_KEY); - this._config = null; this._parent = null; this._element = null; this._triggerArray = null; this._isTransitioning = null; - }; + }; // private - // private - Collapse.prototype._getConfig = function _getConfig(config) { + _proto._getConfig = function _getConfig(config) { config = $.extend({}, Default, config); config.toggle = Boolean(config.toggle); // coerce string values + Util.typeCheckConfig(NAME, config, DefaultType); return config; }; - Collapse.prototype._getDimension = function _getDimension() { + _proto._getDimension = function _getDimension() { var hasWidth = $(this._element).hasClass(Dimension.WIDTH); return hasWidth ? Dimension.WIDTH : Dimension.HEIGHT; }; - Collapse.prototype._getParent = function _getParent() { + _proto._getParent = function _getParent() { var _this3 = this; - var parent = $(this._config.parent)[0]; - var selector = '[data-toggle="collapse"][data-parent="' + this._config.parent + '"]'; + var parent = null; + if (Util.isElement(this._config.parent)) { + parent = this._config.parent; // it's a jQuery object + + if (typeof this._config.parent.jquery !== 'undefined') { + parent = this._config.parent[0]; + } + } else { + parent = $(this._config.parent)[0]; + } + + var selector = "[data-toggle=\"collapse\"][data-parent=\"" + this._config.parent + "\"]"; $(parent).find(selector).each(function (i, element) { _this3._addAriaAndCollapsedClass(Collapse._getTargetFromElement(element), [element]); }); - return parent; }; - Collapse.prototype._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) { + _proto._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) { if (element) { var isOpen = $(element).hasClass(ClassName.SHOW); @@ -1349,9 +1293,8 @@ var Collapse = function () { $(triggerArray).toggleClass(ClassName.COLLAPSED, !isOpen).attr('aria-expanded', isOpen); } } - }; + }; // static - // static Collapse._getTargetFromElement = function _getTargetFromElement(element) { var selector = Util.getSelectorFromElement(element); @@ -1362,7 +1305,8 @@ var Collapse = function () { return this.each(function () { var $this = $(this); var data = $this.data(DATA_KEY); - var _config = $.extend({}, Default, $this.data(), (typeof config === 'undefined' ? 'undefined' : _typeof(config)) === 'object' && config); + + var _config = $.extend({}, Default, $this.data(), typeof config === 'object' && config); if (!data && _config.toggle && /show|hide/.test(config)) { _config.toggle = false; @@ -1375,33 +1319,34 @@ var Collapse = function () { if (typeof config === 'string') { if (typeof data[config] === 'undefined') { - throw new Error('No method named "' + config + '"'); + throw new Error("No method named \"" + config + "\""); } + data[config](); } }); }; createClass(Collapse, null, [{ - key: 'VERSION', + key: "VERSION", get: function get() { return VERSION; } }, { - key: 'Default', + key: "Default", get: function get() { return Default; } }]); return Collapse; }(); - /** * ------------------------------------------------------------------------ * Data Api implementation * ------------------------------------------------------------------------ */ + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { // preventDefault only for <a> elements (which change the URL) not inside the collapsible element if (event.currentTarget.tagName === 'A') { @@ -1414,10 +1359,10 @@ var Collapse = function () { var $target = $(this); var data = $target.data(DATA_KEY); var config = data ? 'toggle' : $trigger.data(); + Collapse._jQueryInterface.call($target, config); }); }); - /** * ------------------------------------------------------------------------ * jQuery @@ -1426,6 +1371,7 @@ var Collapse = function () { $.fn[NAME] = Collapse._jQueryInterface; $.fn[NAME].Constructor = Collapse; + $.fn[NAME].noConflict = function () { $.fn[NAME] = JQUERY_NO_CONFLICT; return Collapse._jQueryInterface; @@ -1442,7 +1388,6 @@ var Collapse = function () { */ var Dropdown = function () { - /** * Check for Popper dependency * Popper - https://popper.js.org @@ -1450,38 +1395,42 @@ var Dropdown = function () { if (typeof Popper === 'undefined') { throw new Error('Bootstrap dropdown require Popper.js (https://popper.js.org)'); } - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ */ + var NAME = 'dropdown'; var VERSION = '4.0.0-beta'; var DATA_KEY = 'bs.dropdown'; - var EVENT_KEY = '.' + DATA_KEY; + var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key + var SPACE_KEYCODE = 32; // KeyboardEvent.which value for space key + var TAB_KEYCODE = 9; // KeyboardEvent.which value for tab key + var ARROW_UP_KEYCODE = 38; // KeyboardEvent.which value for up arrow key + var ARROW_DOWN_KEYCODE = 40; // KeyboardEvent.which value for down arrow key + var RIGHT_MOUSE_BUTTON_WHICH = 3; // MouseEvent.which value for the right button (assuming a right-handed mouse) - var REGEXP_KEYDOWN = new RegExp(ARROW_UP_KEYCODE + '|' + ARROW_DOWN_KEYCODE + '|' + ESCAPE_KEYCODE); + var REGEXP_KEYDOWN = new RegExp(ARROW_UP_KEYCODE + "|" + ARROW_DOWN_KEYCODE + "|" + ESCAPE_KEYCODE); var Event = { - HIDE: 'hide' + EVENT_KEY, - HIDDEN: 'hidden' + EVENT_KEY, - SHOW: 'show' + EVENT_KEY, - SHOWN: 'shown' + EVENT_KEY, - CLICK: 'click' + EVENT_KEY, - CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY, - KEYDOWN_DATA_API: 'keydown' + EVENT_KEY + DATA_API_KEY, - KEYUP_DATA_API: 'keyup' + EVENT_KEY + DATA_API_KEY + HIDE: "hide" + EVENT_KEY, + HIDDEN: "hidden" + EVENT_KEY, + SHOW: "show" + EVENT_KEY, + SHOWN: "shown" + EVENT_KEY, + CLICK: "click" + EVENT_KEY, + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY, + KEYDOWN_DATA_API: "keydown" + EVENT_KEY + DATA_API_KEY, + KEYUP_DATA_API: "keyup" + EVENT_KEY + DATA_API_KEY }; - var ClassName = { DISABLED: 'disabled', SHOW: 'show', @@ -1489,7 +1438,6 @@ var Dropdown = function () { MENURIGHT: 'dropdown-menu-right', MENULEFT: 'dropdown-menu-left' }; - var Selector = { DATA_TOGGLE: '[data-toggle="dropdown"]', FORM_CHILD: '.dropdown form', @@ -1497,23 +1445,19 @@ var Dropdown = function () { NAVBAR_NAV: '.navbar-nav', VISIBLE_ITEMS: '.dropdown-menu .dropdown-item:not(.disabled)' }; - var AttachmentMap = { TOP: 'top-start', TOPEND: 'top-end', BOTTOM: 'bottom-start', BOTTOMEND: 'bottom-end' }; - var Default = { offset: 0, flip: true }; - var DefaultType = { offset: '(number|string)', flip: 'boolean' - /** * ------------------------------------------------------------------------ * Class Definition @@ -1521,10 +1465,11 @@ var Dropdown = function () { */ }; - var Dropdown = function () { - function Dropdown(element, config) { - classCallCheck(this, Dropdown); + var Dropdown = + /*#__PURE__*/ + function () { + function Dropdown(element, config) { this._element = element; this._popper = null; this._config = this._getConfig(config); @@ -1532,18 +1477,19 @@ var Dropdown = function () { this._inNavbar = this._detectNavbar(); this._addEventListeners(); - } + } // getters - // getters - // public + var _proto = Dropdown.prototype; - Dropdown.prototype.toggle = function toggle() { + // public + _proto.toggle = function toggle() { if (this._element.disabled || $(this._element).hasClass(ClassName.DISABLED)) { return; } var parent = Dropdown._getParentFromElement(this._element); + var isActive = $(this._menu).hasClass(ClassName.SHOW); Dropdown._clearMenus(); @@ -1556,104 +1502,108 @@ var Dropdown = function () { relatedTarget: this._element }; var showEvent = $.Event(Event.SHOW, relatedTarget); - $(parent).trigger(showEvent); if (showEvent.isDefaultPrevented()) { return; } - var element = this._element; - // for dropup with alignment we use the parent as popper container + var element = this._element; // for dropup with alignment we use the parent as popper container + if ($(parent).hasClass(ClassName.DROPUP)) { if ($(this._menu).hasClass(ClassName.MENULEFT) || $(this._menu).hasClass(ClassName.MENURIGHT)) { element = parent; } } - this._popper = new Popper(element, this._menu, this._getPopperConfig()); - // if this is a touch-enabled device we add extra + this._popper = new Popper(element, this._menu, this._getPopperConfig()); // 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 && !$(parent).closest(Selector.NAVBAR_NAV).length) { $('body').children().on('mouseover', null, $.noop); } this._element.focus(); + this._element.setAttribute('aria-expanded', true); $(this._menu).toggleClass(ClassName.SHOW); $(parent).toggleClass(ClassName.SHOW).trigger($.Event(Event.SHOWN, relatedTarget)); }; - Dropdown.prototype.dispose = function dispose() { + _proto.dispose = function dispose() { $.removeData(this._element, DATA_KEY); $(this._element).off(EVENT_KEY); this._element = null; this._menu = null; + if (this._popper !== null) { this._popper.destroy(); } + this._popper = null; }; - Dropdown.prototype.update = function update() { + _proto.update = function update() { this._inNavbar = this._detectNavbar(); + if (this._popper !== null) { this._popper.scheduleUpdate(); } - }; + }; // private - // private - Dropdown.prototype._addEventListeners = function _addEventListeners() { + _proto._addEventListeners = function _addEventListeners() { var _this = this; $(this._element).on(Event.CLICK, function (event) { event.preventDefault(); event.stopPropagation(); + _this.toggle(); }); }; - Dropdown.prototype._getConfig = function _getConfig(config) { + _proto._getConfig = function _getConfig(config) { config = $.extend({}, this.constructor.Default, $(this._element).data(), config); - Util.typeCheckConfig(NAME, config, this.constructor.DefaultType); - return config; }; - Dropdown.prototype._getMenuElement = function _getMenuElement() { + _proto._getMenuElement = function _getMenuElement() { if (!this._menu) { var parent = Dropdown._getParentFromElement(this._element); + this._menu = $(parent).find(Selector.MENU)[0]; } + return this._menu; }; - Dropdown.prototype._getPlacement = function _getPlacement() { + _proto._getPlacement = function _getPlacement() { var $parentDropdown = $(this._element).parent(); - var placement = AttachmentMap.BOTTOM; + var placement = AttachmentMap.BOTTOM; // Handle dropup - // Handle dropup if ($parentDropdown.hasClass(ClassName.DROPUP)) { placement = AttachmentMap.TOP; + if ($(this._menu).hasClass(ClassName.MENURIGHT)) { placement = AttachmentMap.TOPEND; } } else if ($(this._menu).hasClass(ClassName.MENURIGHT)) { placement = AttachmentMap.BOTTOMEND; } + return placement; }; - Dropdown.prototype._detectNavbar = function _detectNavbar() { + _proto._detectNavbar = function _detectNavbar() { return $(this._element).closest('.navbar').length > 0; }; - Dropdown.prototype._getPopperConfig = function _getPopperConfig() { + _proto._getPopperConfig = function _getPopperConfig() { var popperConfig = { placement: this._getPlacement(), modifiers: { @@ -1663,23 +1613,25 @@ var Dropdown = function () { flip: { enabled: this._config.flip } - } + } // Disable Popper.js for Dropdown in Navbar - // Disable Popper.js for Dropdown in Navbar - };if (this._inNavbar) { + }; + + if (this._inNavbar) { popperConfig.modifiers.applyStyle = { enabled: !this._inNavbar }; } + return popperConfig; - }; + }; // static - // static Dropdown._jQueryInterface = function _jQueryInterface(config) { return this.each(function () { var data = $(this).data(DATA_KEY); - var _config = (typeof config === 'undefined' ? 'undefined' : _typeof(config)) === 'object' ? config : null; + + var _config = typeof config === 'object' ? config : null; if (!data) { data = new Dropdown(this, _config); @@ -1688,8 +1640,9 @@ var Dropdown = function () { if (typeof config === 'string') { if (typeof data[config] === 'undefined') { - throw new Error('No method named "' + config + '"'); + throw new Error("No method named \"" + config + "\""); } + data[config](); } }); @@ -1701,8 +1654,10 @@ var Dropdown = function () { } var toggles = $.makeArray($(Selector.DATA_TOGGLE)); + for (var i = 0; i < toggles.length; i++) { var parent = Dropdown._getParentFromElement(toggles[i]); + var context = $(toggles[i]).data(DATA_KEY); var relatedTarget = { relatedTarget: toggles[i] @@ -1713,6 +1668,7 @@ var Dropdown = function () { } var dropdownMenu = context._menu; + if (!$(parent).hasClass(ClassName.SHOW)) { continue; } @@ -1723,25 +1679,25 @@ var Dropdown = function () { var hideEvent = $.Event(Event.HIDE, relatedTarget); $(parent).trigger(hideEvent); + if (hideEvent.isDefaultPrevented()) { continue; - } - - // if this is a touch-enabled device we remove the extra + } // 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); } toggles[i].setAttribute('aria-expanded', 'false'); - $(dropdownMenu).removeClass(ClassName.SHOW); $(parent).removeClass(ClassName.SHOW).trigger($.Event(Event.HIDDEN, relatedTarget)); } }; Dropdown._getParentFromElement = function _getParentFromElement(element) { - var parent = void 0; + var parent; var selector = Util.getSelectorFromElement(element); if (selector) { @@ -1764,10 +1720,10 @@ var Dropdown = function () { } var parent = Dropdown._getParentFromElement(this); + var isActive = $(parent).hasClass(ClassName.SHOW); if (!isActive && (event.which !== ESCAPE_KEYCODE || event.which !== SPACE_KEYCODE) || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) { - if (event.which === ESCAPE_KEYCODE) { var toggle = $(parent).find(Selector.DATA_TOGGLE)[0]; $(toggle).trigger('focus'); @@ -1803,38 +1759,38 @@ var Dropdown = function () { }; createClass(Dropdown, null, [{ - key: 'VERSION', + key: "VERSION", get: function get() { return VERSION; } }, { - key: 'Default', + key: "Default", get: function get() { return Default; } }, { - key: 'DefaultType', + key: "DefaultType", get: function get() { return DefaultType; } }]); return Dropdown; }(); - /** * ------------------------------------------------------------------------ * Data Api implementation * ------------------------------------------------------------------------ */ - $(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API + ' ' + Event.KEYUP_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { + + $(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API + " " + Event.KEYUP_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { event.preventDefault(); event.stopPropagation(); + Dropdown._jQueryInterface.call($(this), 'toggle'); }).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) { e.stopPropagation(); }); - /** * ------------------------------------------------------------------------ * jQuery @@ -1843,6 +1799,7 @@ var Dropdown = function () { $.fn[NAME] = Dropdown._jQueryInterface; $.fn[NAME].Constructor = Dropdown; + $.fn[NAME].noConflict = function () { $.fn[NAME] = JQUERY_NO_CONFLICT; return Dropdown._jQueryInterface; @@ -1859,17 +1816,15 @@ var Dropdown = function () { */ var Modal = function () { - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ */ - var NAME = 'modal'; var VERSION = '4.0.0-beta'; var DATA_KEY = 'bs.modal'; - var EVENT_KEY = '.' + DATA_KEY; + var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 300; @@ -1882,28 +1837,25 @@ var Modal = function () { focus: true, show: true }; - var DefaultType = { backdrop: '(boolean|string)', keyboard: 'boolean', focus: 'boolean', show: 'boolean' }; - var Event = { - HIDE: 'hide' + EVENT_KEY, - HIDDEN: 'hidden' + EVENT_KEY, - SHOW: 'show' + EVENT_KEY, - SHOWN: 'shown' + EVENT_KEY, - FOCUSIN: 'focusin' + EVENT_KEY, - RESIZE: 'resize' + EVENT_KEY, - CLICK_DISMISS: 'click.dismiss' + EVENT_KEY, - KEYDOWN_DISMISS: 'keydown.dismiss' + EVENT_KEY, - MOUSEUP_DISMISS: 'mouseup.dismiss' + EVENT_KEY, - MOUSEDOWN_DISMISS: 'mousedown.dismiss' + EVENT_KEY, - CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY + HIDE: "hide" + EVENT_KEY, + HIDDEN: "hidden" + EVENT_KEY, + SHOW: "show" + EVENT_KEY, + SHOWN: "shown" + EVENT_KEY, + FOCUSIN: "focusin" + EVENT_KEY, + RESIZE: "resize" + EVENT_KEY, + CLICK_DISMISS: "click.dismiss" + EVENT_KEY, + KEYDOWN_DISMISS: "keydown.dismiss" + EVENT_KEY, + MOUSEUP_DISMISS: "mouseup.dismiss" + EVENT_KEY, + MOUSEDOWN_DISMISS: "mousedown.dismiss" + EVENT_KEY, + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY }; - var ClassName = { SCROLLBAR_MEASURER: 'modal-scrollbar-measure', BACKDROP: 'modal-backdrop', @@ -1911,7 +1863,6 @@ var Modal = function () { FADE: 'fade', SHOW: 'show' }; - var Selector = { DIALOG: '.modal-dialog', DATA_TOGGLE: '[data-toggle="modal"]', @@ -1919,7 +1870,6 @@ var Modal = function () { FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top', STICKY_CONTENT: '.sticky-top', NAVBAR_TOGGLER: '.navbar-toggler' - /** * ------------------------------------------------------------------------ * Class Definition @@ -1927,10 +1877,11 @@ var Modal = function () { */ }; - var Modal = function () { - function Modal(element, config) { - classCallCheck(this, Modal); + var Modal = + /*#__PURE__*/ + function () { + function Modal(element, config) { this._config = this._getConfig(config); this._element = element; this._dialog = $(element).find(Selector.DIALOG)[0]; @@ -1940,17 +1891,17 @@ var Modal = function () { this._ignoreBackdropClick = false; this._originalBodyPadding = 0; this._scrollbarWidth = 0; - } + } // getters - // getters - // public + var _proto = Modal.prototype; - Modal.prototype.toggle = function toggle(relatedTarget) { + // public + _proto.toggle = function toggle(relatedTarget) { return this._isShown ? this.hide() : this.show(relatedTarget); }; - Modal.prototype.show = function show(relatedTarget) { + _proto.show = function show(relatedTarget) { var _this = this; if (this._isTransitioning) { @@ -1964,7 +1915,6 @@ var Modal = function () { var showEvent = $.Event(Event.SHOW, { relatedTarget: relatedTarget }); - $(this._element).trigger(showEvent); if (this._isShown || showEvent.isDefaultPrevented()) { @@ -1974,6 +1924,7 @@ var Modal = function () { this._isShown = true; this._checkScrollbar(); + this._setScrollbar(); this._adjustDialog(); @@ -1981,12 +1932,12 @@ var Modal = function () { $(document.body).addClass(ClassName.OPEN); this._setEscapeEvent(); + this._setResizeEvent(); $(this._element).on(Event.CLICK_DISMISS, Selector.DATA_DISMISS, function (event) { return _this.hide(event); }); - $(this._dialog).on(Event.MOUSEDOWN_DISMISS, function () { $(_this._element).one(Event.MOUSEUP_DISMISS, function (event) { if ($(event.target).is(_this._element)) { @@ -2000,7 +1951,7 @@ var Modal = function () { }); }; - Modal.prototype.hide = function hide(event) { + _proto.hide = function hide(event) { var _this2 = this; if (event) { @@ -2018,7 +1969,6 @@ var Modal = function () { } var hideEvent = $.Event(Event.HIDE); - $(this._element).trigger(hideEvent); if (!this._isShown || hideEvent.isDefaultPrevented()) { @@ -2028,17 +1978,15 @@ var Modal = function () { this._isShown = false; this._setEscapeEvent(); + this._setResizeEvent(); $(document).off(Event.FOCUSIN); - $(this._element).removeClass(ClassName.SHOW); - $(this._element).off(Event.CLICK_DISMISS); $(this._dialog).off(Event.MOUSEDOWN_DISMISS); if (transition) { - $(this._element).one(Util.TRANSITION_END, function (event) { return _this2._hideModal(event); }).emulateTransitionEnd(TRANSITION_DURATION); @@ -2047,11 +1995,9 @@ var Modal = function () { } }; - Modal.prototype.dispose = function dispose() { + _proto.dispose = function dispose() { $.removeData(this._element, DATA_KEY); - $(window, document, this._element, this._backdrop).off(EVENT_KEY); - this._config = null; this._element = null; this._dialog = null; @@ -2062,19 +2008,18 @@ var Modal = function () { this._scrollbarWidth = null; }; - Modal.prototype.handleUpdate = function handleUpdate() { + _proto.handleUpdate = function handleUpdate() { this._adjustDialog(); - }; + }; // private - // private - Modal.prototype._getConfig = function _getConfig(config) { + _proto._getConfig = function _getConfig(config) { config = $.extend({}, Default, config); Util.typeCheckConfig(NAME, config, DefaultType); return config; }; - Modal.prototype._showElement = function _showElement(relatedTarget) { + _proto._showElement = function _showElement(relatedTarget) { var _this3 = this; var transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE); @@ -2085,7 +2030,9 @@ var Modal = function () { } this._element.style.display = 'block'; + this._element.removeAttribute('aria-hidden'); + this._element.scrollTop = 0; if (transition) { @@ -2106,6 +2053,7 @@ var Modal = function () { if (_this3._config.focus) { _this3._element.focus(); } + _this3._isTransitioning = false; $(_this3._element).trigger(shownEvent); }; @@ -2117,7 +2065,7 @@ var Modal = function () { } }; - Modal.prototype._enforceFocus = function _enforceFocus() { + _proto._enforceFocus = function _enforceFocus() { var _this4 = this; $(document).off(Event.FOCUSIN) // guard against infinite focus loop @@ -2128,13 +2076,14 @@ var Modal = function () { }); }; - Modal.prototype._setEscapeEvent = function _setEscapeEvent() { + _proto._setEscapeEvent = function _setEscapeEvent() { var _this5 = this; if (this._isShown && this._config.keyboard) { $(this._element).on(Event.KEYDOWN_DISMISS, function (event) { if (event.which === ESCAPE_KEYCODE) { event.preventDefault(); + _this5.hide(); } }); @@ -2143,7 +2092,7 @@ var Modal = function () { } }; - Modal.prototype._setResizeEvent = function _setResizeEvent() { + _proto._setResizeEvent = function _setResizeEvent() { var _this6 = this; if (this._isShown) { @@ -2155,35 +2104,40 @@ var Modal = function () { } }; - Modal.prototype._hideModal = function _hideModal() { + _proto._hideModal = function _hideModal() { var _this7 = this; this._element.style.display = 'none'; + this._element.setAttribute('aria-hidden', true); + this._isTransitioning = false; + this._showBackdrop(function () { $(document.body).removeClass(ClassName.OPEN); + _this7._resetAdjustments(); + _this7._resetScrollbar(); + $(_this7._element).trigger(Event.HIDDEN); }); }; - Modal.prototype._removeBackdrop = function _removeBackdrop() { + _proto._removeBackdrop = function _removeBackdrop() { if (this._backdrop) { $(this._backdrop).remove(); this._backdrop = null; } }; - Modal.prototype._showBackdrop = function _showBackdrop(callback) { + _proto._showBackdrop = function _showBackdrop(callback) { var _this8 = this; var animate = $(this._element).hasClass(ClassName.FADE) ? ClassName.FADE : ''; if (this._isShown && this._config.backdrop) { var doAnimate = Util.supportsTransitionEnd() && animate; - this._backdrop = document.createElement('div'); this._backdrop.className = ClassName.BACKDROP; @@ -2192,15 +2146,16 @@ var Modal = function () { } $(this._backdrop).appendTo(document.body); - $(this._element).on(Event.CLICK_DISMISS, function (event) { if (_this8._ignoreBackdropClick) { _this8._ignoreBackdropClick = false; return; } + if (event.target !== event.currentTarget) { return; } + if (_this8._config.backdrop === 'static') { _this8._element.focus(); } else { @@ -2229,6 +2184,7 @@ var Modal = function () { var callbackRemove = function callbackRemove() { _this8._removeBackdrop(); + if (callback) { callback(); } @@ -2242,96 +2198,92 @@ var Modal = function () { } else if (callback) { callback(); } - }; - - // ---------------------------------------------------------------------- + }; // ---------------------------------------------------------------------- // the following methods are used to handle overflowing modals // todo (fat): these should probably be refactored out of modal.js // ---------------------------------------------------------------------- - Modal.prototype._adjustDialog = function _adjustDialog() { + + _proto._adjustDialog = function _adjustDialog() { var isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight; if (!this._isBodyOverflowing && isModalOverflowing) { - this._element.style.paddingLeft = this._scrollbarWidth + 'px'; + this._element.style.paddingLeft = this._scrollbarWidth + "px"; } if (this._isBodyOverflowing && !isModalOverflowing) { - this._element.style.paddingRight = this._scrollbarWidth + 'px'; + this._element.style.paddingRight = this._scrollbarWidth + "px"; } }; - Modal.prototype._resetAdjustments = function _resetAdjustments() { + _proto._resetAdjustments = function _resetAdjustments() { this._element.style.paddingLeft = ''; this._element.style.paddingRight = ''; }; - Modal.prototype._checkScrollbar = function _checkScrollbar() { + _proto._checkScrollbar = function _checkScrollbar() { var rect = document.body.getBoundingClientRect(); this._isBodyOverflowing = rect.left + rect.right < window.innerWidth; this._scrollbarWidth = this._getScrollbarWidth(); }; - Modal.prototype._setScrollbar = function _setScrollbar() { + _proto._setScrollbar = function _setScrollbar() { var _this9 = this; if (this._isBodyOverflowing) { // Note: DOMNode.style.paddingRight returns the actual value or '' if not set // while $(DOMNode).css('padding-right') returns the calculated value or 0 if not set - // Adjust fixed content padding $(Selector.FIXED_CONTENT).each(function (index, element) { var actualPadding = $(element)[0].style.paddingRight; var calculatedPadding = $(element).css('padding-right'); - $(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this9._scrollbarWidth + 'px'); - }); + $(element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this9._scrollbarWidth + "px"); + }); // Adjust sticky content margin - // Adjust sticky content margin $(Selector.STICKY_CONTENT).each(function (index, element) { var actualMargin = $(element)[0].style.marginRight; var calculatedMargin = $(element).css('margin-right'); - $(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) - _this9._scrollbarWidth + 'px'); - }); + $(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) - _this9._scrollbarWidth + "px"); + }); // Adjust navbar-toggler margin - // Adjust navbar-toggler margin $(Selector.NAVBAR_TOGGLER).each(function (index, element) { var actualMargin = $(element)[0].style.marginRight; var calculatedMargin = $(element).css('margin-right'); - $(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) + _this9._scrollbarWidth + 'px'); - }); + $(element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) + _this9._scrollbarWidth + "px"); + }); // Adjust body padding - // Adjust body padding var actualPadding = document.body.style.paddingRight; var calculatedPadding = $('body').css('padding-right'); - $('body').data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + 'px'); + $('body').data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + "px"); } }; - Modal.prototype._resetScrollbar = function _resetScrollbar() { + _proto._resetScrollbar = function _resetScrollbar() { // Restore fixed content padding $(Selector.FIXED_CONTENT).each(function (index, element) { var padding = $(element).data('padding-right'); + if (typeof padding !== 'undefined') { $(element).css('padding-right', padding).removeData('padding-right'); } - }); + }); // Restore sticky content and navbar-toggler margin - // Restore sticky content and navbar-toggler margin - $(Selector.STICKY_CONTENT + ', ' + Selector.NAVBAR_TOGGLER).each(function (index, element) { + $(Selector.STICKY_CONTENT + ", " + Selector.NAVBAR_TOGGLER).each(function (index, element) { var margin = $(element).data('margin-right'); + if (typeof margin !== 'undefined') { $(element).css('margin-right', margin).removeData('margin-right'); } - }); + }); // Restore body padding - // Restore body padding var padding = $('body').data('padding-right'); + if (typeof padding !== 'undefined') { $('body').css('padding-right', padding).removeData('padding-right'); } }; - Modal.prototype._getScrollbarWidth = function _getScrollbarWidth() { + _proto._getScrollbarWidth = function _getScrollbarWidth() { // thx d.walsh var scrollDiv = document.createElement('div'); scrollDiv.className = ClassName.SCROLLBAR_MEASURER; @@ -2339,14 +2291,14 @@ var Modal = function () { var scrollbarWidth = scrollDiv.getBoundingClientRect().width - scrollDiv.clientWidth; document.body.removeChild(scrollDiv); return scrollbarWidth; - }; + }; // static - // static Modal._jQueryInterface = function _jQueryInterface(config, relatedTarget) { return this.each(function () { var data = $(this).data(DATA_KEY); - var _config = $.extend({}, Modal.Default, $(this).data(), (typeof config === 'undefined' ? 'undefined' : _typeof(config)) === 'object' && config); + + var _config = $.extend({}, Modal.Default, $(this).data(), typeof config === 'object' && config); if (!data) { data = new Modal(this, _config); @@ -2355,8 +2307,9 @@ var Modal = function () { if (typeof config === 'string') { if (typeof data[config] === 'undefined') { - throw new Error('No method named "' + config + '"'); + throw new Error("No method named \"" + config + "\""); } + data[config](relatedTarget); } else if (_config.show) { data.show(relatedTarget); @@ -2365,29 +2318,29 @@ var Modal = function () { }; createClass(Modal, null, [{ - key: 'VERSION', + key: "VERSION", get: function get() { return VERSION; } }, { - key: 'Default', + key: "Default", get: function get() { return Default; } }]); return Modal; }(); - /** * ------------------------------------------------------------------------ * Data Api implementation * ------------------------------------------------------------------------ */ + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { var _this10 = this; - var target = void 0; + var target; var selector = Util.getSelectorFromElement(this); if (selector) { @@ -2415,7 +2368,6 @@ var Modal = function () { Modal._jQueryInterface.call($(target), config, this); }); - /** * ------------------------------------------------------------------------ * jQuery @@ -2424,6 +2376,7 @@ var Modal = function () { $.fn[NAME] = Modal._jQueryInterface; $.fn[NAME].Constructor = Modal; + $.fn[NAME].noConflict = function () { $.fn[NAME] = JQUERY_NO_CONFLICT; return Modal._jQueryInterface; @@ -2440,7 +2393,6 @@ var Modal = function () { */ var Tooltip = function () { - /** * Check for Popper dependency * Popper - https://popper.js.org @@ -2448,22 +2400,21 @@ var Tooltip = function () { if (typeof Popper === 'undefined') { throw new Error('Bootstrap tooltips require Popper.js (https://popper.js.org)'); } - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ */ + var NAME = 'tooltip'; var VERSION = '4.0.0-beta'; var DATA_KEY = 'bs.tooltip'; - var EVENT_KEY = '.' + DATA_KEY; + var EVENT_KEY = "." + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; var CLASS_PREFIX = 'bs-tooltip'; - var BSCLS_PREFIX_REGEX = new RegExp('(^|\\s)' + CLASS_PREFIX + '\\S+', 'g'); - + var BSCLS_PREFIX_REGEX = new RegExp("(^|\\s)" + CLASS_PREFIX + "\\S+", 'g'); var DefaultType = { animation: 'boolean', template: 'string', @@ -2477,7 +2428,6 @@ var Tooltip = function () { container: '(string|element|boolean)', fallbackPlacement: '(string|array)' }; - var AttachmentMap = { AUTO: 'auto', TOP: 'top', @@ -2485,7 +2435,6 @@ var Tooltip = function () { BOTTOM: 'bottom', LEFT: 'left' }; - var Default = { animation: true, template: '<div class="tooltip" role="tooltip">' + '<div class="arrow"></div>' + '<div class="tooltip-inner"></div></div>', @@ -2499,42 +2448,36 @@ var Tooltip = function () { container: false, fallbackPlacement: 'flip' }; - var HoverState = { SHOW: 'show', OUT: 'out' }; - var Event = { - HIDE: 'hide' + EVENT_KEY, - HIDDEN: 'hidden' + EVENT_KEY, - SHOW: 'show' + EVENT_KEY, - SHOWN: 'shown' + EVENT_KEY, - INSERTED: 'inserted' + EVENT_KEY, - CLICK: 'click' + EVENT_KEY, - FOCUSIN: 'focusin' + EVENT_KEY, - FOCUSOUT: 'focusout' + EVENT_KEY, - MOUSEENTER: 'mouseenter' + EVENT_KEY, - MOUSELEAVE: 'mouseleave' + EVENT_KEY + HIDE: "hide" + EVENT_KEY, + HIDDEN: "hidden" + EVENT_KEY, + SHOW: "show" + EVENT_KEY, + SHOWN: "shown" + EVENT_KEY, + INSERTED: "inserted" + EVENT_KEY, + CLICK: "click" + EVENT_KEY, + FOCUSIN: "focusin" + EVENT_KEY, + FOCUSOUT: "focusout" + EVENT_KEY, + MOUSEENTER: "mouseenter" + EVENT_KEY, + MOUSELEAVE: "mouseleave" + EVENT_KEY }; - var ClassName = { FADE: 'fade', SHOW: 'show' }; - var Selector = { TOOLTIP: '.tooltip', TOOLTIP_INNER: '.tooltip-inner', ARROW: '.arrow' }; - var Trigger = { HOVER: 'hover', FOCUS: 'focus', CLICK: 'click', MANUAL: 'manual' - /** * ------------------------------------------------------------------------ * Class Definition @@ -2542,43 +2485,42 @@ var Tooltip = function () { */ }; - var Tooltip = function () { - function Tooltip(element, config) { - classCallCheck(this, Tooltip); - + var Tooltip = + /*#__PURE__*/ + function () { + function Tooltip(element, config) { // private this._isEnabled = true; this._timeout = 0; this._hoverState = ''; this._activeTrigger = {}; - this._popper = null; + this._popper = null; // protected - // protected this.element = element; this.config = this._getConfig(config); this.tip = null; this._setListeners(); - } + } // getters - // getters - // public + var _proto = Tooltip.prototype; - Tooltip.prototype.enable = function enable() { + // public + _proto.enable = function enable() { this._isEnabled = true; }; - Tooltip.prototype.disable = function disable() { + _proto.disable = function disable() { this._isEnabled = false; }; - Tooltip.prototype.toggleEnabled = function toggleEnabled() { + _proto.toggleEnabled = function toggleEnabled() { this._isEnabled = !this._isEnabled; }; - Tooltip.prototype.toggle = function toggle(event) { + _proto.toggle = function toggle(event) { if (!this._isEnabled) { return; } @@ -2600,9 +2542,9 @@ var Tooltip = function () { context._leave(null, context); } } else { - if ($(this.getTipElement()).hasClass(ClassName.SHOW)) { this._leave(null, this); + return; } @@ -2610,11 +2552,9 @@ var Tooltip = function () { } }; - Tooltip.prototype.dispose = function dispose() { + _proto.dispose = function dispose() { clearTimeout(this._timeout); - $.removeData(this.element, this.constructor.DATA_KEY); - $(this.element).off(this.constructor.EVENT_KEY); $(this.element).closest('.modal').off('hide.bs.modal'); @@ -2626,6 +2566,7 @@ var Tooltip = function () { this._timeout = null; this._hoverState = null; this._activeTrigger = null; + if (this._popper !== null) { this._popper.destroy(); } @@ -2636,7 +2577,7 @@ var Tooltip = function () { this.tip = null; }; - Tooltip.prototype.show = function show() { + _proto.show = function show() { var _this = this; if ($(this.element).css('display') === 'none') { @@ -2644,9 +2585,9 @@ var Tooltip = function () { } var showEvent = $.Event(this.constructor.Event.SHOW); + if (this.isWithContent() && this._isEnabled) { $(this.element).trigger(showEvent); - var isInTheDom = $.contains(this.element.ownerDocument.documentElement, this.element); if (showEvent.isDefaultPrevented() || !isInTheDom) { @@ -2655,10 +2596,8 @@ var Tooltip = function () { var tip = this.getTipElement(); var tipId = Util.getUID(this.constructor.NAME); - tip.setAttribute('id', tipId); this.element.setAttribute('aria-describedby', tipId); - this.setContent(); if (this.config.animation) { @@ -2668,10 +2607,9 @@ var Tooltip = function () { var placement = typeof this.config.placement === 'function' ? this.config.placement.call(this, tip, this.element) : this.config.placement; var attachment = this._getAttachment(placement); - this.addAttachmentClass(attachment); + this.addAttachmentClass(attachment); var container = this.config.container === false ? document.body : $(this.config.container); - $(tip).data(this.constructor.DATA_KEY, this); if (!$.contains(this.element.ownerDocument.documentElement, this.tip)) { @@ -2679,7 +2617,6 @@ var Tooltip = function () { } $(this.element).trigger(this.constructor.Event.INSERTED); - this._popper = new Popper(this.element, tip, { placement: attachment, modifiers: { @@ -2702,13 +2639,11 @@ var Tooltip = function () { _this._handlePopperPlacementChange(data); } }); - - $(tip).addClass(ClassName.SHOW); - - // if this is a touch-enabled device we add extra + $(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); } @@ -2717,9 +2652,9 @@ var Tooltip = function () { if (_this.config.animation) { _this._fixTransition(); } + var prevHoverState = _this._hoverState; _this._hoverState = null; - $(_this.element).trigger(_this.constructor.Event.SHOWN); if (prevHoverState === HoverState.OUT) { @@ -2735,19 +2670,23 @@ var Tooltip = function () { } }; - Tooltip.prototype.hide = function hide(callback) { + _proto.hide = function hide(callback) { var _this2 = this; var tip = this.getTipElement(); var hideEvent = $.Event(this.constructor.Event.HIDE); + var complete = function complete() { if (_this2._hoverState !== HoverState.SHOW && tip.parentNode) { tip.parentNode.removeChild(tip); } _this2._cleanTipClass(); + _this2.element.removeAttribute('aria-describedby'); + $(_this2.element).trigger(_this2.constructor.Event.HIDDEN); + if (_this2._popper !== null) { _this2._popper.destroy(); } @@ -2763,10 +2702,9 @@ var Tooltip = function () { return; } - $(tip).removeClass(ClassName.SHOW); - - // if this is a touch-enabled device we remove the extra + $(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); } @@ -2776,7 +2714,6 @@ var Tooltip = function () { this._activeTrigger[Trigger.HOVER] = false; if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { - $(tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION); } else { complete(); @@ -2785,36 +2722,36 @@ var Tooltip = function () { this._hoverState = ''; }; - Tooltip.prototype.update = function update() { + _proto.update = function update() { if (this._popper !== null) { this._popper.scheduleUpdate(); } - }; + }; // protected - // protected - Tooltip.prototype.isWithContent = function isWithContent() { + _proto.isWithContent = function isWithContent() { return Boolean(this.getTitle()); }; - Tooltip.prototype.addAttachmentClass = function addAttachmentClass(attachment) { - $(this.getTipElement()).addClass(CLASS_PREFIX + '-' + attachment); + _proto.addAttachmentClass = function addAttachmentClass(attachment) { + $(this.getTipElement()).addClass(CLASS_PREFIX + "-" + attachment); }; - Tooltip.prototype.getTipElement = function getTipElement() { + _proto.getTipElement = function getTipElement() { this.tip = this.tip || $(this.config.template)[0]; return this.tip; }; - Tooltip.prototype.setContent = function setContent() { + _proto.setContent = function setContent() { var $tip = $(this.getTipElement()); this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle()); - $tip.removeClass(ClassName.FADE + ' ' + ClassName.SHOW); + $tip.removeClass(ClassName.FADE + " " + ClassName.SHOW); }; - Tooltip.prototype.setElementContent = function setElementContent($element, content) { + _proto.setElementContent = function setElementContent($element, content) { var html = this.config.html; - if ((typeof content === 'undefined' ? 'undefined' : _typeof(content)) === 'object' && (content.nodeType || content.jquery)) { + + if (typeof content === 'object' && (content.nodeType || content.jquery)) { // content is a DOM node or a jQuery if (html) { if (!$(content).parent().is($element)) { @@ -2828,7 +2765,7 @@ var Tooltip = function () { } }; - Tooltip.prototype.getTitle = function getTitle() { + _proto.getTitle = function getTitle() { var title = this.element.getAttribute('data-original-title'); if (!title) { @@ -2836,19 +2773,17 @@ var Tooltip = function () { } return title; - }; + }; // private - // private - Tooltip.prototype._getAttachment = function _getAttachment(placement) { + _proto._getAttachment = function _getAttachment(placement) { return AttachmentMap[placement.toUpperCase()]; }; - Tooltip.prototype._setListeners = function _setListeners() { + _proto._setListeners = function _setListeners() { var _this3 = this; var triggers = this.config.trigger.split(' '); - triggers.forEach(function (trigger) { if (trigger === 'click') { $(_this3.element).on(_this3.constructor.Event.CLICK, _this3.config.selector, function (event) { @@ -2857,7 +2792,6 @@ var Tooltip = function () { } else if (trigger !== Trigger.MANUAL) { var eventIn = trigger === Trigger.HOVER ? _this3.constructor.Event.MOUSEENTER : _this3.constructor.Event.FOCUSIN; var eventOut = trigger === Trigger.HOVER ? _this3.constructor.Event.MOUSELEAVE : _this3.constructor.Event.FOCUSOUT; - $(_this3.element).on(eventIn, _this3.config.selector, function (event) { return _this3._enter(event); }).on(eventOut, _this3.config.selector, function (event) { @@ -2880,17 +2814,17 @@ var Tooltip = function () { } }; - Tooltip.prototype._fixTitle = function _fixTitle() { - var titleType = _typeof(this.element.getAttribute('data-original-title')); + _proto._fixTitle = function _fixTitle() { + var titleType = typeof this.element.getAttribute('data-original-title'); + if (this.element.getAttribute('title') || titleType !== 'string') { this.element.setAttribute('data-original-title', this.element.getAttribute('title') || ''); this.element.setAttribute('title', ''); } }; - Tooltip.prototype._enter = function _enter(event, context) { + _proto._enter = function _enter(event, context) { var dataKey = this.constructor.DATA_KEY; - context = context || $(event.currentTarget).data(dataKey); if (!context) { @@ -2908,7 +2842,6 @@ var Tooltip = function () { } clearTimeout(context._timeout); - context._hoverState = HoverState.SHOW; if (!context.config.delay || !context.config.delay.show) { @@ -2923,9 +2856,8 @@ var Tooltip = function () { }, context.config.delay.show); }; - Tooltip.prototype._leave = function _leave(event, context) { + _proto._leave = function _leave(event, context) { var dataKey = this.constructor.DATA_KEY; - context = context || $(event.currentTarget).data(dataKey); if (!context) { @@ -2942,7 +2874,6 @@ var Tooltip = function () { } clearTimeout(context._timeout); - context._hoverState = HoverState.OUT; if (!context.config.delay || !context.config.delay.hide) { @@ -2957,7 +2888,7 @@ var Tooltip = function () { }, context.config.delay.hide); }; - Tooltip.prototype._isWithActiveTrigger = function _isWithActiveTrigger() { + _proto._isWithActiveTrigger = function _isWithActiveTrigger() { for (var trigger in this._activeTrigger) { if (this._activeTrigger[trigger]) { return true; @@ -2967,7 +2898,7 @@ var Tooltip = function () { return false; }; - Tooltip.prototype._getConfig = function _getConfig(config) { + _proto._getConfig = function _getConfig(config) { config = $.extend({}, this.constructor.Default, $(this.element).data(), config); if (typeof config.delay === 'number') { @@ -2986,11 +2917,10 @@ var Tooltip = function () { } Util.typeCheckConfig(NAME, config, this.constructor.DefaultType); - return config; }; - Tooltip.prototype._getDelegateConfig = function _getDelegateConfig() { + _proto._getDelegateConfig = function _getDelegateConfig() { var config = {}; if (this.config) { @@ -3004,38 +2934,42 @@ var Tooltip = function () { return config; }; - Tooltip.prototype._cleanTipClass = function _cleanTipClass() { + _proto._cleanTipClass = function _cleanTipClass() { var $tip = $(this.getTipElement()); var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX); + if (tabClass !== null && tabClass.length > 0) { $tip.removeClass(tabClass.join('')); } }; - Tooltip.prototype._handlePopperPlacementChange = function _handlePopperPlacementChange(data) { + _proto._handlePopperPlacementChange = function _handlePopperPlacementChange(data) { this._cleanTipClass(); + this.addAttachmentClass(this._getAttachment(data.placement)); }; - Tooltip.prototype._fixTransition = function _fixTransition() { + _proto._fixTransition = function _fixTransition() { var tip = this.getTipElement(); var initConfigAnimation = this.config.animation; + if (tip.getAttribute('x-placement') !== null) { return; } + $(tip).removeClass(ClassName.FADE); this.config.animation = false; this.hide(); this.show(); this.config.animation = initConfigAnimation; - }; + }; // static - // static Tooltip._jQueryInterface = function _jQueryInterface(config) { return this.each(function () { var data = $(this).data(DATA_KEY); - var _config = (typeof config === 'undefined' ? 'undefined' : _typeof(config)) === 'object' && config; + + var _config = typeof config === 'object' && config; if (!data && /dispose|hide/.test(config)) { return; @@ -3048,60 +2982,62 @@ var Tooltip = function () { if (typeof config === 'string') { if (typeof data[config] === 'undefined') { - throw new Error('No method named "' + config + '"'); + throw new Error("No method named \"" + config + "\""); } + data[config](); } }); }; createClass(Tooltip, null, [{ - key: 'VERSION', + key: "VERSION", get: function get() { return VERSION; } }, { - key: 'Default', + key: "Default", get: function get() { return Default; } }, { - key: 'NAME', + key: "NAME", get: function get() { return NAME; } }, { - key: 'DATA_KEY', + key: "DATA_KEY", get: function get() { return DATA_KEY; } }, { - key: 'Event', + key: "Event", get: function get() { return Event; } }, { - key: 'EVENT_KEY', + key: "EVENT_KEY", get: function get() { return EVENT_KEY; } }, { - key: 'DefaultType', + key: "DefaultType", get: function get() { return DefaultType; } }]); return Tooltip; }(); - /** * ------------------------------------------------------------------------ * jQuery * ------------------------------------------------------------------------ */ + $.fn[NAME] = Tooltip._jQueryInterface; $.fn[NAME].Constructor = Tooltip; + $.fn[NAME].noConflict = function () { $.fn[NAME] = JQUERY_NO_CONFLICT; return Tooltip._jQueryInterface; @@ -3118,54 +3054,46 @@ var Tooltip = function () { */ var Popover = function () { - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ */ - var NAME = 'popover'; var VERSION = '4.0.0-beta'; var DATA_KEY = 'bs.popover'; - var EVENT_KEY = '.' + DATA_KEY; + var EVENT_KEY = "." + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; var CLASS_PREFIX = 'bs-popover'; - var BSCLS_PREFIX_REGEX = new RegExp('(^|\\s)' + CLASS_PREFIX + '\\S+', 'g'); - + var BSCLS_PREFIX_REGEX = new RegExp("(^|\\s)" + CLASS_PREFIX + "\\S+", 'g'); var Default = $.extend({}, Tooltip.Default, { placement: 'right', trigger: 'click', content: '', template: '<div class="popover" role="tooltip">' + '<div class="arrow"></div>' + '<h3 class="popover-header"></h3>' + '<div class="popover-body"></div></div>' }); - var DefaultType = $.extend({}, Tooltip.DefaultType, { content: '(string|element|function)' }); - var ClassName = { FADE: 'fade', SHOW: 'show' }; - var Selector = { TITLE: '.popover-header', CONTENT: '.popover-body' }; - var Event = { - HIDE: 'hide' + EVENT_KEY, - HIDDEN: 'hidden' + EVENT_KEY, - SHOW: 'show' + EVENT_KEY, - SHOWN: 'shown' + EVENT_KEY, - INSERTED: 'inserted' + EVENT_KEY, - CLICK: 'click' + EVENT_KEY, - FOCUSIN: 'focusin' + EVENT_KEY, - FOCUSOUT: 'focusout' + EVENT_KEY, - MOUSEENTER: 'mouseenter' + EVENT_KEY, - MOUSELEAVE: 'mouseleave' + EVENT_KEY - + HIDE: "hide" + EVENT_KEY, + HIDDEN: "hidden" + EVENT_KEY, + SHOW: "show" + EVENT_KEY, + SHOWN: "shown" + EVENT_KEY, + INSERTED: "inserted" + EVENT_KEY, + CLICK: "click" + EVENT_KEY, + FOCUSIN: "focusin" + EVENT_KEY, + FOCUSOUT: "focusout" + EVENT_KEY, + MOUSEENTER: "mouseenter" + EVENT_KEY, + MOUSELEAVE: "mouseleave" + EVENT_KEY /** * ------------------------------------------------------------------------ * Class Definition @@ -3173,59 +3101,60 @@ var Popover = function () { */ }; - var Popover = function (_Tooltip) { - inherits(Popover, _Tooltip); + + var Popover = + /*#__PURE__*/ + function (_Tooltip) { + inheritsLoose(Popover, _Tooltip); function Popover() { - classCallCheck(this, Popover); - return possibleConstructorReturn(this, _Tooltip.apply(this, arguments)); + return _Tooltip.apply(this, arguments) || this; } - // overrides + var _proto = Popover.prototype; - Popover.prototype.isWithContent = function isWithContent() { + // overrides + _proto.isWithContent = function isWithContent() { return this.getTitle() || this._getContent(); }; - Popover.prototype.addAttachmentClass = function addAttachmentClass(attachment) { - $(this.getTipElement()).addClass(CLASS_PREFIX + '-' + attachment); + _proto.addAttachmentClass = function addAttachmentClass(attachment) { + $(this.getTipElement()).addClass(CLASS_PREFIX + "-" + attachment); }; - Popover.prototype.getTipElement = function getTipElement() { + _proto.getTipElement = function getTipElement() { this.tip = this.tip || $(this.config.template)[0]; return this.tip; }; - Popover.prototype.setContent = function setContent() { - var $tip = $(this.getTipElement()); + _proto.setContent = function setContent() { + var $tip = $(this.getTipElement()); // we use append for html objects to maintain js events - // we use append for html objects to maintain js events this.setElementContent($tip.find(Selector.TITLE), this.getTitle()); this.setElementContent($tip.find(Selector.CONTENT), this._getContent()); + $tip.removeClass(ClassName.FADE + " " + ClassName.SHOW); + }; // private - $tip.removeClass(ClassName.FADE + ' ' + ClassName.SHOW); - }; - - // private - Popover.prototype._getContent = function _getContent() { + _proto._getContent = function _getContent() { return this.element.getAttribute('data-content') || (typeof this.config.content === 'function' ? this.config.content.call(this.element) : this.config.content); }; - Popover.prototype._cleanTipClass = function _cleanTipClass() { + _proto._cleanTipClass = function _cleanTipClass() { var $tip = $(this.getTipElement()); var tabClass = $tip.attr('class').match(BSCLS_PREFIX_REGEX); + if (tabClass !== null && tabClass.length > 0) { $tip.removeClass(tabClass.join('')); } - }; + }; // static - // static Popover._jQueryInterface = function _jQueryInterface(config) { return this.each(function () { var data = $(this).data(DATA_KEY); - var _config = (typeof config === 'undefined' ? 'undefined' : _typeof(config)) === 'object' ? config : null; + + var _config = typeof config === 'object' ? config : null; if (!data && /destroy|hide/.test(config)) { return; @@ -3238,64 +3167,63 @@ var Popover = function () { if (typeof config === 'string') { if (typeof data[config] === 'undefined') { - throw new Error('No method named "' + config + '"'); + throw new Error("No method named \"" + config + "\""); } + data[config](); } }); }; createClass(Popover, null, [{ - key: 'VERSION', - - + key: "VERSION", // getters - get: function get() { return VERSION; } }, { - key: 'Default', + key: "Default", get: function get() { return Default; } }, { - key: 'NAME', + key: "NAME", get: function get() { return NAME; } }, { - key: 'DATA_KEY', + key: "DATA_KEY", get: function get() { return DATA_KEY; } }, { - key: 'Event', + key: "Event", get: function get() { return Event; } }, { - key: 'EVENT_KEY', + key: "EVENT_KEY", get: function get() { return EVENT_KEY; } }, { - key: 'DefaultType', + key: "DefaultType", get: function get() { return DefaultType; } }]); return Popover; }(Tooltip); - /** * ------------------------------------------------------------------------ * jQuery * ------------------------------------------------------------------------ */ + $.fn[NAME] = Popover._jQueryInterface; $.fn[NAME].Constructor = Popover; + $.fn[NAME].noConflict = function () { $.fn[NAME] = JQUERY_NO_CONFLICT; return Popover._jQueryInterface; @@ -3312,59 +3240,51 @@ var Popover = function () { */ var ScrollSpy = function () { - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ */ - var NAME = 'scrollspy'; var VERSION = '4.0.0-beta'; var DATA_KEY = 'bs.scrollspy'; - var EVENT_KEY = '.' + DATA_KEY; + var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; - var Default = { offset: 10, method: 'auto', target: '' }; - var DefaultType = { offset: 'number', method: 'string', target: '(string|element)' }; - var Event = { - ACTIVATE: 'activate' + EVENT_KEY, - SCROLL: 'scroll' + EVENT_KEY, - LOAD_DATA_API: 'load' + EVENT_KEY + DATA_API_KEY + ACTIVATE: "activate" + EVENT_KEY, + SCROLL: "scroll" + EVENT_KEY, + LOAD_DATA_API: "load" + EVENT_KEY + DATA_API_KEY }; - var ClassName = { DROPDOWN_ITEM: 'dropdown-item', DROPDOWN_MENU: 'dropdown-menu', ACTIVE: 'active' }; - var Selector = { DATA_SPY: '[data-spy="scroll"]', ACTIVE: '.active', NAV_LIST_GROUP: '.nav, .list-group', NAV_LINKS: '.nav-link', + NAV_ITEMS: '.nav-item', LIST_ITEMS: '.list-group-item', DROPDOWN: '.dropdown', DROPDOWN_ITEMS: '.dropdown-item', DROPDOWN_TOGGLE: '.dropdown-toggle' }; - var OffsetMethod = { OFFSET: 'offset', POSITION: 'position' - /** * ------------------------------------------------------------------------ * Class Definition @@ -3372,51 +3292,45 @@ var ScrollSpy = function () { */ }; - var ScrollSpy = function () { + + var ScrollSpy = + /*#__PURE__*/ + function () { function ScrollSpy(element, config) { var _this = this; - classCallCheck(this, ScrollSpy); - this._element = element; this._scrollElement = element.tagName === 'BODY' ? window : element; this._config = this._getConfig(config); - this._selector = this._config.target + ' ' + Selector.NAV_LINKS + ',' + (this._config.target + ' ' + Selector.LIST_ITEMS + ',') + (this._config.target + ' ' + Selector.DROPDOWN_ITEMS); + this._selector = this._config.target + " " + Selector.NAV_LINKS + "," + (this._config.target + " " + Selector.LIST_ITEMS + ",") + (this._config.target + " " + Selector.DROPDOWN_ITEMS); this._offsets = []; this._targets = []; this._activeTarget = null; this._scrollHeight = 0; - $(this._scrollElement).on(Event.SCROLL, function (event) { return _this._process(event); }); - this.refresh(); + this._process(); - } + } // getters - // getters - // public + var _proto = ScrollSpy.prototype; - ScrollSpy.prototype.refresh = function refresh() { + // public + _proto.refresh = function refresh() { var _this2 = this; var autoMethod = this._scrollElement !== this._scrollElement.window ? OffsetMethod.POSITION : OffsetMethod.OFFSET; - var offsetMethod = this._config.method === 'auto' ? autoMethod : this._config.method; - var offsetBase = offsetMethod === OffsetMethod.POSITION ? this._getScrollTop() : 0; - this._offsets = []; this._targets = []; - this._scrollHeight = this._getScrollHeight(); - var targets = $.makeArray($(this._selector)); - targets.map(function (element) { - var target = void 0; + var target; var targetSelector = Util.getSelectorFromElement(element); if (targetSelector) { @@ -3425,11 +3339,13 @@ var ScrollSpy = function () { if (target) { var targetBCR = target.getBoundingClientRect(); + if (targetBCR.width || targetBCR.height) { // todo (fat): remove sketch reliance on jQuery position/offset return [$(target)[offsetMethod]().top + offsetBase, targetSelector]; } } + return null; }).filter(function (item) { return item; @@ -3437,14 +3353,14 @@ var ScrollSpy = function () { return a[0] - b[0]; }).forEach(function (item) { _this2._offsets.push(item[0]); + _this2._targets.push(item[1]); }); }; - ScrollSpy.prototype.dispose = function dispose() { + _proto.dispose = function dispose() { $.removeData(this._element, DATA_KEY); $(this._scrollElement).off(EVENT_KEY); - this._element = null; this._scrollElement = null; this._config = null; @@ -3453,42 +3369,44 @@ var ScrollSpy = function () { this._targets = null; this._activeTarget = null; this._scrollHeight = null; - }; + }; // private - // private - ScrollSpy.prototype._getConfig = function _getConfig(config) { + _proto._getConfig = function _getConfig(config) { config = $.extend({}, Default, config); if (typeof config.target !== 'string') { var id = $(config.target).attr('id'); + if (!id) { id = Util.getUID(NAME); $(config.target).attr('id', id); } - config.target = '#' + id; + + config.target = "#" + id; } Util.typeCheckConfig(NAME, config, DefaultType); - return config; }; - ScrollSpy.prototype._getScrollTop = function _getScrollTop() { + _proto._getScrollTop = function _getScrollTop() { return this._scrollElement === window ? this._scrollElement.pageYOffset : this._scrollElement.scrollTop; }; - ScrollSpy.prototype._getScrollHeight = function _getScrollHeight() { + _proto._getScrollHeight = function _getScrollHeight() { return this._scrollElement.scrollHeight || Math.max(document.body.scrollHeight, document.documentElement.scrollHeight); }; - ScrollSpy.prototype._getOffsetHeight = function _getOffsetHeight() { + _proto._getOffsetHeight = function _getOffsetHeight() { return this._scrollElement === window ? window.innerHeight : this._scrollElement.getBoundingClientRect().height; }; - ScrollSpy.prototype._process = function _process() { + _proto._process = function _process() { var scrollTop = this._getScrollTop() + this._config.offset; + var scrollHeight = this._getScrollHeight(); + var maxScroll = this._config.offset + scrollHeight - this._getOffsetHeight(); if (this._scrollHeight !== scrollHeight) { @@ -3501,12 +3419,15 @@ var ScrollSpy = function () { if (this._activeTarget !== target) { this._activate(target); } + return; } if (this._activeTarget && scrollTop < this._offsets[0] && this._offsets[0] > 0) { this._activeTarget = null; + this._clear(); + return; } @@ -3519,17 +3440,17 @@ var ScrollSpy = function () { } }; - ScrollSpy.prototype._activate = function _activate(target) { + _proto._activate = function _activate(target) { this._activeTarget = target; this._clear(); - var queries = this._selector.split(','); - // eslint-disable-next-line arrow-body-style + var queries = this._selector.split(','); // eslint-disable-next-line arrow-body-style + + queries = queries.map(function (selector) { - return selector + '[data-target="' + target + '"],' + (selector + '[href="' + target + '"]'); + return selector + "[data-target=\"" + target + "\"]," + (selector + "[href=\"" + target + "\"]"); }); - var $link = $(queries.join(',')); if ($link.hasClass(ClassName.DROPDOWN_ITEM)) { @@ -3537,10 +3458,12 @@ var ScrollSpy = function () { $link.addClass(ClassName.ACTIVE); } else { // Set triggered link as active - $link.addClass(ClassName.ACTIVE); - // Set triggered links parents as active + $link.addClass(ClassName.ACTIVE); // Set triggered links parents as active // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor - $link.parents(Selector.NAV_LIST_GROUP).prev(Selector.NAV_LINKS + ', ' + Selector.LIST_ITEMS).addClass(ClassName.ACTIVE); + + $link.parents(Selector.NAV_LIST_GROUP).prev(Selector.NAV_LINKS + ", " + Selector.LIST_ITEMS).addClass(ClassName.ACTIVE); // Handle special case when .nav-link is inside .nav-item + + $link.parents(Selector.NAV_LIST_GROUP).prev(Selector.NAV_ITEMS).children(Selector.NAV_LINKS).addClass(ClassName.ACTIVE); } $(this._scrollElement).trigger(Event.ACTIVATE, { @@ -3548,16 +3471,16 @@ var ScrollSpy = function () { }); }; - ScrollSpy.prototype._clear = function _clear() { + _proto._clear = function _clear() { $(this._selector).filter(Selector.ACTIVE).removeClass(ClassName.ACTIVE); - }; + }; // static - // static ScrollSpy._jQueryInterface = function _jQueryInterface(config) { return this.each(function () { var data = $(this).data(DATA_KEY); - var _config = (typeof config === 'undefined' ? 'undefined' : _typeof(config)) === 'object' && config; + + var _config = typeof config === 'object' && config; if (!data) { data = new ScrollSpy(this, _config); @@ -3566,42 +3489,43 @@ var ScrollSpy = function () { if (typeof config === 'string') { if (typeof data[config] === 'undefined') { - throw new Error('No method named "' + config + '"'); + throw new Error("No method named \"" + config + "\""); } + data[config](); } }); }; createClass(ScrollSpy, null, [{ - key: 'VERSION', + key: "VERSION", get: function get() { return VERSION; } }, { - key: 'Default', + key: "Default", get: function get() { return Default; } }]); return ScrollSpy; }(); - /** * ------------------------------------------------------------------------ * Data Api implementation * ------------------------------------------------------------------------ */ + $(window).on(Event.LOAD_DATA_API, function () { var scrollSpys = $.makeArray($(Selector.DATA_SPY)); for (var i = scrollSpys.length; i--;) { var $spy = $(scrollSpys[i]); + ScrollSpy._jQueryInterface.call($spy, $spy.data()); } }); - /** * ------------------------------------------------------------------------ * jQuery @@ -3610,6 +3534,7 @@ var ScrollSpy = function () { $.fn[NAME] = ScrollSpy._jQueryInterface; $.fn[NAME].Constructor = ScrollSpy; + $.fn[NAME].noConflict = function () { $.fn[NAME] = JQUERY_NO_CONFLICT; return ScrollSpy._jQueryInterface; @@ -3626,29 +3551,25 @@ var ScrollSpy = function () { */ var Tab = function () { - /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ */ - var NAME = 'tab'; var VERSION = '4.0.0-beta'; var DATA_KEY = 'bs.tab'; - var EVENT_KEY = '.' + DATA_KEY; + var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; - var Event = { - HIDE: 'hide' + EVENT_KEY, - HIDDEN: 'hidden' + EVENT_KEY, - SHOW: 'show' + EVENT_KEY, - SHOWN: 'shown' + EVENT_KEY, - CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY + HIDE: "hide" + EVENT_KEY, + HIDDEN: "hidden" + EVENT_KEY, + SHOW: "show" + EVENT_KEY, + SHOWN: "shown" + EVENT_KEY, + CLICK_DATA_API: "click" + EVENT_KEY + DATA_API_KEY }; - var ClassName = { DROPDOWN_MENU: 'dropdown-menu', ACTIVE: 'active', @@ -3656,7 +3577,6 @@ var Tab = function () { FADE: 'fade', SHOW: 'show' }; - var Selector = { DROPDOWN: '.dropdown', NAV_LIST_GROUP: '.nav, .list-group', @@ -3665,7 +3585,6 @@ var Tab = function () { DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]', DROPDOWN_TOGGLE: '.dropdown-toggle', DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active' - /** * ------------------------------------------------------------------------ * Class Definition @@ -3673,26 +3592,27 @@ var Tab = function () { */ }; - var Tab = function () { - function Tab(element) { - classCallCheck(this, Tab); + var Tab = + /*#__PURE__*/ + function () { + function Tab(element) { this._element = element; - } + } // getters - // getters - // public + var _proto = Tab.prototype; - Tab.prototype.show = function show() { + // public + _proto.show = function show() { var _this = this; if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && $(this._element).hasClass(ClassName.ACTIVE) || $(this._element).hasClass(ClassName.DISABLED)) { return; } - var target = void 0; - var previous = void 0; + var target; + var previous; var listElement = $(this._element).closest(Selector.NAV_LIST_GROUP)[0]; var selector = Util.getSelectorFromElement(this._element); @@ -3705,7 +3625,6 @@ var Tab = function () { var hideEvent = $.Event(Event.HIDE, { relatedTarget: this._element }); - var showEvent = $.Event(Event.SHOW, { relatedTarget: previous }); @@ -3730,11 +3649,9 @@ var Tab = function () { var hiddenEvent = $.Event(Event.HIDDEN, { relatedTarget: _this._element }); - var shownEvent = $.Event(Event.SHOWN, { relatedTarget: previous }); - $(previous).trigger(hiddenEvent); $(_this._element).trigger(shownEvent); }; @@ -3746,17 +3663,17 @@ var Tab = function () { } }; - Tab.prototype.dispose = function dispose() { + _proto.dispose = function dispose() { $.removeData(this._element, DATA_KEY); this._element = null; - }; + }; // private - // private - Tab.prototype._activate = function _activate(element, container, callback) { + _proto._activate = function _activate(element, container, callback) { var _this2 = this; - var activeElements = void 0; + var activeElements; + if (container.nodeName === 'UL') { activeElements = $(container).find(Selector.ACTIVE_UL); } else { @@ -3781,21 +3698,25 @@ var Tab = function () { } }; - Tab.prototype._transitionComplete = function _transitionComplete(element, active, isTransitioning, callback) { + _proto._transitionComplete = function _transitionComplete(element, active, isTransitioning, callback) { if (active) { $(active).removeClass(ClassName.ACTIVE); - var dropdownChild = $(active.parentNode).find(Selector.DROPDOWN_ACTIVE_CHILD)[0]; if (dropdownChild) { $(dropdownChild).removeClass(ClassName.ACTIVE); } - active.setAttribute('aria-expanded', false); + if (active.getAttribute('role') === 'tab') { + active.setAttribute('aria-selected', false); + } } $(element).addClass(ClassName.ACTIVE); - element.setAttribute('aria-expanded', true); + + if (element.getAttribute('role') === 'tab') { + element.setAttribute('aria-selected', true); + } if (isTransitioning) { Util.reflow(element); @@ -3805,8 +3726,8 @@ var Tab = function () { } if (element.parentNode && $(element.parentNode).hasClass(ClassName.DROPDOWN_MENU)) { - var dropdownElement = $(element).closest(Selector.DROPDOWN)[0]; + if (dropdownElement) { $(dropdownElement).find(Selector.DROPDOWN_TOGGLE).addClass(ClassName.ACTIVE); } @@ -3817,9 +3738,8 @@ var Tab = function () { if (callback) { callback(); } - }; + }; // static - // static Tab._jQueryInterface = function _jQueryInterface(config) { return this.each(function () { @@ -3833,33 +3753,34 @@ var Tab = function () { if (typeof config === 'string') { if (typeof data[config] === 'undefined') { - throw new Error('No method named "' + config + '"'); + throw new Error("No method named \"" + config + "\""); } + data[config](); } }); }; createClass(Tab, null, [{ - key: 'VERSION', + key: "VERSION", get: function get() { return VERSION; } }]); return Tab; }(); - /** * ------------------------------------------------------------------------ * Data Api implementation * ------------------------------------------------------------------------ */ + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { event.preventDefault(); + Tab._jQueryInterface.call($(this), 'show'); }); - /** * ------------------------------------------------------------------------ * jQuery @@ -3868,6 +3789,7 @@ var Tab = function () { $.fn[NAME] = Tab._jQueryInterface; $.fn[NAME].Constructor = Tab; + $.fn[NAME].noConflict = function () { $.fn[NAME] = JQUERY_NO_CONFLICT; return Tab._jQueryInterface; @@ -3891,6 +3813,7 @@ var Tab = function () { var version = $.fn.jquery.split(' ')[0].split('.'); var min = 3; var max = 4; + if (version[0] < min || version[0] >= max) { throw new Error('Bootstrap\'s JavaScript requires at least jQuery v3.0.0 but less than v4.0.0'); } |