diff options
Diffstat (limited to 'assets/javascripts/bootstrap.js')
| -rw-r--r-- | assets/javascripts/bootstrap.js | 519 |
1 files changed, 312 insertions, 207 deletions
diff --git a/assets/javascripts/bootstrap.js b/assets/javascripts/bootstrap.js index 063bb7a..2568773 100644 --- a/assets/javascripts/bootstrap.js +++ b/assets/javascripts/bootstrap.js @@ -1,11 +1,11 @@ /*! - * Bootstrap v4.0.0-alpha.5 (https://getbootstrap.com) - * Copyright 2011-2016 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) + * Bootstrap v4.0.0-alpha.6 (https://getbootstrap.com) + * Copyright 2011-2017 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ if (typeof jQuery === 'undefined') { - throw new Error('Bootstrap\'s JavaScript requires jQuery') + throw new Error('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.') } +function ($) { @@ -30,7 +30,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): util.js + * Bootstrap (v4.0.0-alpha.6): util.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -85,7 +85,9 @@ var Util = function ($) { for (var name in TransitionEndEvent) { if (el.style[name] !== undefined) { - return { end: TransitionEndEvent[name] }; + return { + end: TransitionEndEvent[name] + }; } } @@ -132,9 +134,8 @@ var Util = function ($) { getUID: function getUID(prefix) { do { - /* eslint-disable no-bitwise */ + // eslint-disable-next-line no-bitwise prefix += ~~(Math.random() * MAX_UID); // "~~" acts like a faster Math.floor() here - /* eslint-enable no-bitwise */ } while (document.getElementById(prefix)); return prefix; }, @@ -149,7 +150,7 @@ var Util = function ($) { return selector; }, reflow: function reflow(element) { - new Function('bs', 'return bs')(element.offsetHeight); + return element.offsetHeight; }, triggerTransitionEnd: function triggerTransitionEnd(element) { $(element).trigger(transition.end); @@ -162,13 +163,7 @@ var Util = function ($) { if (configTypes.hasOwnProperty(property)) { var expectedTypes = configTypes[property]; var value = config[property]; - var valueType = void 0; - - if (value && isElement(value)) { - valueType = 'element'; - } else { - valueType = toType(value); - } + var valueType = value && 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 + '".')); @@ -185,7 +180,7 @@ var Util = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): alert.js + * Bootstrap (v4.0.0-alpha.6): alert.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -199,7 +194,7 @@ var Alert = function ($) { */ var NAME = 'alert'; - var VERSION = '4.0.0-alpha.5'; + var VERSION = '4.0.0-alpha.6'; var DATA_KEY = 'bs.alert'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -219,7 +214,7 @@ var Alert = function ($) { var ClassName = { ALERT: 'alert', FADE: 'fade', - IN: 'in' + SHOW: 'show' }; /** @@ -282,14 +277,18 @@ var Alert = function ($) { }; Alert.prototype._removeElement = function _removeElement(element) { - $(element).removeClass(ClassName.IN); + var _this2 = this; + + $(element).removeClass(ClassName.SHOW); if (!Util.supportsTransitionEnd() || !$(element).hasClass(ClassName.FADE)) { this._destroyElement(element); return; } - $(element).one(Util.TRANSITION_END, $.proxy(this._destroyElement, this, element)).emulateTransitionEnd(TRANSITION_DURATION); + $(element).one(Util.TRANSITION_END, function (event) { + return _this2._destroyElement(element, event); + }).emulateTransitionEnd(TRANSITION_DURATION); }; Alert.prototype._destroyElement = function _destroyElement(element) { @@ -360,7 +359,7 @@ var Alert = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): button.js + * Bootstrap (v4.0.0-alpha.6): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -374,7 +373,7 @@ var Button = function ($) { */ var NAME = 'button'; - var VERSION = '4.0.0-alpha.5'; + var VERSION = '4.0.0-alpha.6'; var DATA_KEY = 'bs.button'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -438,15 +437,15 @@ var Button = function ($) { if (triggerChangeEvent) { input.checked = !$(this._element).hasClass(ClassName.ACTIVE); - $(this._element).trigger('change'); + $(input).trigger('change'); } input.focus(); } - } else { - this._element.setAttribute('aria-pressed', !$(this._element).hasClass(ClassName.ACTIVE)); } + this._element.setAttribute('aria-pressed', !$(this._element).hasClass(ClassName.ACTIVE)); + if (triggerChangeEvent) { $(this._element).toggleClass(ClassName.ACTIVE); } @@ -523,7 +522,7 @@ var Button = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): carousel.js + * Bootstrap (v4.0.0-alpha.6): carousel.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -537,7 +536,7 @@ var Carousel = function ($) { */ var NAME = 'carousel'; - var VERSION = '4.0.0-alpha.5'; + var VERSION = '4.0.0-alpha.6'; var DATA_KEY = 'bs.carousel'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -564,7 +563,9 @@ var Carousel = function ($) { var Direction = { NEXT: 'next', - PREVIOUS: 'prev' + PREV: 'prev', + LEFT: 'left', + RIGHT: 'right' }; var Event = { @@ -581,8 +582,10 @@ var Carousel = function ($) { CAROUSEL: 'carousel', ACTIVE: 'active', SLIDE: 'slide', - RIGHT: 'right', - LEFT: 'left', + RIGHT: 'carousel-item-right', + LEFT: 'carousel-item-left', + NEXT: 'carousel-item-next', + PREV: 'carousel-item-prev', ITEM: 'carousel-item' }; @@ -590,7 +593,7 @@ var Carousel = function ($) { ACTIVE: '.active', ACTIVE_ITEM: '.active.carousel-item', ITEM: '.carousel-item', - NEXT_PREV: '.next, .prev', + NEXT_PREV: '.carousel-item-next, .carousel-item-prev', INDICATORS: '.carousel-indicators', DATA_SLIDE: '[data-slide], [data-slide-to]', DATA_RIDE: '[data-ride="carousel"]' @@ -625,9 +628,10 @@ var Carousel = function ($) { // public Carousel.prototype.next = function next() { - if (!this._isSliding) { - this._slide(Direction.NEXT); + if (this._isSliding) { + throw new Error('Carousel is sliding'); } + this._slide(Direction.NEXT); }; Carousel.prototype.nextWhenVisible = function nextWhenVisible() { @@ -638,9 +642,10 @@ var Carousel = function ($) { }; Carousel.prototype.prev = function prev() { - if (!this._isSliding) { - this._slide(Direction.PREVIOUS); + if (this._isSliding) { + throw new Error('Carousel is sliding'); } + this._slide(Direction.PREVIOUS); }; Carousel.prototype.pause = function pause(event) { @@ -668,12 +673,12 @@ var Carousel = function ($) { } if (this._config.interval && !this._isPaused) { - this._interval = setInterval($.proxy(document.visibilityState ? this.nextWhenVisible : this.next, this), this._config.interval); + this._interval = setInterval((document.visibilityState ? this.nextWhenVisible : this.next).bind(this), this._config.interval); } }; Carousel.prototype.to = function to(index) { - var _this2 = this; + var _this3 = this; this._activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0]; @@ -685,7 +690,7 @@ var Carousel = function ($) { if (this._isSliding) { $(this._element).one(Event.SLID, function () { - return _this2.to(index); + return _this3.to(index); }); return; } @@ -724,27 +729,35 @@ var Carousel = function ($) { }; Carousel.prototype._addEventListeners = function _addEventListeners() { + var _this4 = this; + if (this._config.keyboard) { - $(this._element).on(Event.KEYDOWN, $.proxy(this._keydown, this)); + $(this._element).on(Event.KEYDOWN, function (event) { + return _this4._keydown(event); + }); } if (this._config.pause === 'hover' && !('ontouchstart' in document.documentElement)) { - $(this._element).on(Event.MOUSEENTER, $.proxy(this.pause, this)).on(Event.MOUSELEAVE, $.proxy(this.cycle, this)); + $(this._element).on(Event.MOUSEENTER, function (event) { + return _this4.pause(event); + }).on(Event.MOUSELEAVE, function (event) { + return _this4.cycle(event); + }); } }; Carousel.prototype._keydown = function _keydown(event) { - event.preventDefault(); - if (/input|textarea/i.test(event.target.tagName)) { return; } switch (event.which) { case ARROW_LEFT_KEYCODE: + event.preventDefault(); this.prev(); break; case ARROW_RIGHT_KEYCODE: + event.preventDefault(); this.next(); break; default: @@ -774,10 +787,10 @@ var Carousel = function ($) { return itemIndex === -1 ? this._items[this._items.length - 1] : this._items[itemIndex]; }; - Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, directionalClassname) { + Carousel.prototype._triggerSlideEvent = function _triggerSlideEvent(relatedTarget, eventDirectionName) { var slideEvent = $.Event(Event.SLIDE, { relatedTarget: relatedTarget, - direction: directionalClassname + direction: eventDirectionName }); $(this._element).trigger(slideEvent); @@ -798,21 +811,33 @@ var Carousel = function ($) { }; Carousel.prototype._slide = function _slide(direction, element) { - var _this3 = this; + var _this5 = this; var activeElement = $(this._element).find(Selector.ACTIVE_ITEM)[0]; var nextElement = element || activeElement && this._getItemByDirection(direction, activeElement); var isCycling = Boolean(this._interval); - var directionalClassName = direction === Direction.NEXT ? ClassName.LEFT : ClassName.RIGHT; + var directionalClassName = void 0; + var orderClassName = void 0; + var eventDirectionName = void 0; + + if (direction === Direction.NEXT) { + directionalClassName = ClassName.LEFT; + orderClassName = ClassName.NEXT; + eventDirectionName = Direction.LEFT; + } else { + directionalClassName = ClassName.RIGHT; + orderClassName = ClassName.PREV; + eventDirectionName = Direction.RIGHT; + } if (nextElement && $(nextElement).hasClass(ClassName.ACTIVE)) { this._isSliding = false; return; } - var slideEvent = this._triggerSlideEvent(nextElement, directionalClassName); + var slideEvent = this._triggerSlideEvent(nextElement, eventDirectionName); if (slideEvent.isDefaultPrevented()) { return; } @@ -832,12 +857,12 @@ var Carousel = function ($) { var slidEvent = $.Event(Event.SLID, { relatedTarget: nextElement, - direction: directionalClassName + direction: eventDirectionName }); if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.SLIDE)) { - $(nextElement).addClass(direction); + $(nextElement).addClass(orderClassName); Util.reflow(nextElement); @@ -845,16 +870,14 @@ var Carousel = function ($) { $(nextElement).addClass(directionalClassName); $(activeElement).one(Util.TRANSITION_END, function () { - $(nextElement).removeClass(directionalClassName).removeClass(direction); + $(nextElement).removeClass(directionalClassName + ' ' + orderClassName).addClass(ClassName.ACTIVE); - $(nextElement).addClass(ClassName.ACTIVE); + $(activeElement).removeClass(ClassName.ACTIVE + ' ' + orderClassName + ' ' + directionalClassName); - $(activeElement).removeClass(ClassName.ACTIVE).removeClass(direction).removeClass(directionalClassName); - - _this3._isSliding = false; + _this5._isSliding = false; setTimeout(function () { - return $(_this3._element).trigger(slidEvent); + return $(_this5._element).trigger(slidEvent); }, 0); }).emulateTransitionEnd(TRANSITION_DURATION); } else { @@ -979,7 +1002,7 @@ var Carousel = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): collapse.js + * Bootstrap (v4.0.0-alpha.6): collapse.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -993,7 +1016,7 @@ var Collapse = function ($) { */ var NAME = 'collapse'; - var VERSION = '4.0.0-alpha.5'; + var VERSION = '4.0.0-alpha.6'; var DATA_KEY = 'bs.collapse'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -1019,7 +1042,7 @@ var Collapse = function ($) { }; var ClassName = { - IN: 'in', + SHOW: 'show', COLLAPSE: 'collapse', COLLAPSING: 'collapsing', COLLAPSED: 'collapsed' @@ -1031,7 +1054,7 @@ var Collapse = function ($) { }; var Selector = { - ACTIVES: '.card > .in, .card > .collapsing', + ACTIVES: '.card > .show, .card > .collapsing', DATA_TOGGLE: '[data-toggle="collapse"]' }; @@ -1066,7 +1089,7 @@ var Collapse = function ($) { // public Collapse.prototype.toggle = function toggle() { - if ($(this._element).hasClass(ClassName.IN)) { + if ($(this._element).hasClass(ClassName.SHOW)) { this.hide(); } else { this.show(); @@ -1074,9 +1097,13 @@ var Collapse = function ($) { }; Collapse.prototype.show = function show() { - var _this4 = this; + var _this6 = this; - if (this._isTransitioning || $(this._element).hasClass(ClassName.IN)) { + if (this._isTransitioning) { + throw new Error('Collapse is transitioning'); + } + + if ($(this._element).hasClass(ClassName.SHOW)) { return; } @@ -1084,7 +1111,7 @@ var Collapse = function ($) { var activesData = void 0; if (this._parent) { - actives = $.makeArray($(Selector.ACTIVES)); + actives = $.makeArray($(this._parent).find(Selector.ACTIVES)); if (!actives.length) { actives = null; } @@ -1124,13 +1151,13 @@ var Collapse = function ($) { this.setTransitioning(true); var complete = function complete() { - $(_this4._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).addClass(ClassName.IN); + $(_this6._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).addClass(ClassName.SHOW); - _this4._element.style[dimension] = ''; + _this6._element.style[dimension] = ''; - _this4.setTransitioning(false); + _this6.setTransitioning(false); - $(_this4._element).trigger(Event.SHOWN); + $(_this6._element).trigger(Event.SHOWN); }; if (!Util.supportsTransitionEnd()) { @@ -1147,9 +1174,13 @@ var Collapse = function ($) { }; Collapse.prototype.hide = function hide() { - var _this5 = this; + var _this7 = this; - if (this._isTransitioning || !$(this._element).hasClass(ClassName.IN)) { + if (this._isTransitioning) { + throw new Error('Collapse is transitioning'); + } + + if (!$(this._element).hasClass(ClassName.SHOW)) { return; } @@ -1166,7 +1197,7 @@ var Collapse = function ($) { Util.reflow(this._element); - $(this._element).addClass(ClassName.COLLAPSING).removeClass(ClassName.COLLAPSE).removeClass(ClassName.IN); + $(this._element).addClass(ClassName.COLLAPSING).removeClass(ClassName.COLLAPSE).removeClass(ClassName.SHOW); this._element.setAttribute('aria-expanded', false); @@ -1177,8 +1208,8 @@ var Collapse = function ($) { this.setTransitioning(true); var complete = function complete() { - _this5.setTransitioning(false); - $(_this5._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).trigger(Event.HIDDEN); + _this7.setTransitioning(false); + $(_this7._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).trigger(Event.HIDDEN); }; this._element.style[dimension] = ''; @@ -1220,13 +1251,13 @@ var Collapse = function ($) { }; Collapse.prototype._getParent = function _getParent() { - var _this6 = this; + var _this8 = this; var parent = $(this._config.parent)[0]; var selector = '[data-toggle="collapse"][data-parent="' + this._config.parent + '"]'; $(parent).find(selector).each(function (i, element) { - _this6._addAriaAndCollapsedClass(Collapse._getTargetFromElement(element), [element]); + _this8._addAriaAndCollapsedClass(Collapse._getTargetFromElement(element), [element]); }); return parent; @@ -1234,7 +1265,7 @@ var Collapse = function ($) { Collapse.prototype._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) { if (element) { - var isOpen = $(element).hasClass(ClassName.IN); + var isOpen = $(element).hasClass(ClassName.SHOW); element.setAttribute('aria-expanded', isOpen); if (triggerArray.length) { @@ -1323,7 +1354,7 @@ var Collapse = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): dropdown.js + * Bootstrap (v4.0.0-alpha.6): dropdown.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -1337,7 +1368,7 @@ var Dropdown = function ($) { */ var NAME = 'dropdown'; - var VERSION = '4.0.0-alpha.5'; + var VERSION = '4.0.0-alpha.6'; var DATA_KEY = 'bs.dropdown'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -1354,13 +1385,14 @@ var Dropdown = function ($) { SHOWN: 'shown' + EVENT_KEY, CLICK: 'click' + EVENT_KEY, CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY, + FOCUSIN_DATA_API: 'focusin' + EVENT_KEY + DATA_API_KEY, KEYDOWN_DATA_API: 'keydown' + EVENT_KEY + DATA_API_KEY }; var ClassName = { BACKDROP: 'dropdown-backdrop', DISABLED: 'disabled', - OPEN: 'open' + SHOW: 'show' }; var Selector = { @@ -1398,7 +1430,7 @@ var Dropdown = function ($) { } var parent = Dropdown._getParentFromElement(this); - var isActive = $(parent).hasClass(ClassName.OPEN); + var isActive = $(parent).hasClass(ClassName.SHOW); Dropdown._clearMenus(); @@ -1415,7 +1447,9 @@ var Dropdown = function ($) { $(dropdown).on('click', Dropdown._clearMenus); } - var relatedTarget = { relatedTarget: this }; + var relatedTarget = { + relatedTarget: this + }; var showEvent = $.Event(Event.SHOW, relatedTarget); $(parent).trigger(showEvent); @@ -1425,9 +1459,9 @@ var Dropdown = function ($) { } this.focus(); - this.setAttribute('aria-expanded', 'true'); + this.setAttribute('aria-expanded', true); - $(parent).toggleClass(ClassName.OPEN); + $(parent).toggleClass(ClassName.SHOW); $(parent).trigger($.Event(Event.SHOWN, relatedTarget)); return false; @@ -1452,7 +1486,8 @@ var Dropdown = function ($) { var data = $(this).data(DATA_KEY); if (!data) { - $(this).data(DATA_KEY, data = new Dropdown(this)); + data = new Dropdown(this); + $(this).data(DATA_KEY, data); } if (typeof config === 'string') { @@ -1478,13 +1513,15 @@ var Dropdown = function ($) { for (var i = 0; i < toggles.length; i++) { var parent = Dropdown._getParentFromElement(toggles[i]); - var relatedTarget = { relatedTarget: toggles[i] }; + var relatedTarget = { + relatedTarget: toggles[i] + }; - if (!$(parent).hasClass(ClassName.OPEN)) { + if (!$(parent).hasClass(ClassName.SHOW)) { continue; } - if (event && event.type === 'click' && /input|textarea/i.test(event.target.tagName) && $.contains(parent, event.target)) { + if (event && (event.type === 'click' && /input|textarea/i.test(event.target.tagName) || event.type === 'focusin') && $.contains(parent, event.target)) { continue; } @@ -1496,7 +1533,7 @@ var Dropdown = function ($) { toggles[i].setAttribute('aria-expanded', 'false'); - $(parent).removeClass(ClassName.OPEN).trigger($.Event(Event.HIDDEN, relatedTarget)); + $(parent).removeClass(ClassName.SHOW).trigger($.Event(Event.HIDDEN, relatedTarget)); } }; @@ -1524,7 +1561,7 @@ var Dropdown = function ($) { } var parent = Dropdown._getParentFromElement(this); - var isActive = $(parent).hasClass(ClassName.OPEN); + var isActive = $(parent).hasClass(ClassName.SHOW); if (!isActive && event.which !== ESCAPE_KEYCODE || isActive && event.which === ESCAPE_KEYCODE) { @@ -1537,11 +1574,7 @@ var Dropdown = function ($) { return; } - var items = $.makeArray($(Selector.VISIBLE_ITEMS)); - - items = items.filter(function (item) { - return item.offsetWidth || item.offsetHeight; - }); + var items = $(parent).find(Selector.VISIBLE_ITEMS).get(); if (!items.length) { return; @@ -1582,7 +1615,7 @@ var Dropdown = function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) { + $(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API + ' ' + Event.FOCUSIN_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) { e.stopPropagation(); }); @@ -1604,7 +1637,7 @@ var Dropdown = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): modal.js + * Bootstrap (v4.0.0-alpha.6): modal.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -1618,7 +1651,7 @@ var Modal = function ($) { */ var NAME = 'modal'; - var VERSION = '4.0.0-alpha.5'; + var VERSION = '4.0.0-alpha.6'; var DATA_KEY = 'bs.modal'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -1660,14 +1693,14 @@ var Modal = function ($) { BACKDROP: 'modal-backdrop', OPEN: 'modal-open', FADE: 'fade', - IN: 'in' + SHOW: 'show' }; var Selector = { DIALOG: '.modal-dialog', DATA_TOGGLE: '[data-toggle="modal"]', DATA_DISMISS: '[data-dismiss="modal"]', - FIXED_CONTENT: '.navbar-fixed-top, .navbar-fixed-bottom, .is-fixed' + FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top' }; /** @@ -1687,6 +1720,7 @@ var Modal = function ($) { this._isShown = false; this._isBodyOverflowing = false; this._ignoreBackdropClick = false; + this._isTransitioning = false; this._originalBodyPadding = 0; this._scrollbarWidth = 0; } @@ -1700,8 +1734,15 @@ var Modal = function ($) { }; Modal.prototype.show = function show(relatedTarget) { - var _this7 = this; + var _this9 = this; + if (this._isTransitioning) { + throw new Error('Modal is transitioning'); + } + + if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE)) { + this._isTransitioning = true; + } var showEvent = $.Event(Event.SHOW, { relatedTarget: relatedTarget }); @@ -1722,26 +1763,40 @@ var Modal = function ($) { this._setEscapeEvent(); this._setResizeEvent(); - $(this._element).on(Event.CLICK_DISMISS, Selector.DATA_DISMISS, $.proxy(this.hide, this)); + $(this._element).on(Event.CLICK_DISMISS, Selector.DATA_DISMISS, function (event) { + return _this9.hide(event); + }); $(this._dialog).on(Event.MOUSEDOWN_DISMISS, function () { - $(_this7._element).one(Event.MOUSEUP_DISMISS, function (event) { - if ($(event.target).is(_this7._element)) { - _this7._ignoreBackdropClick = true; + $(_this9._element).one(Event.MOUSEUP_DISMISS, function (event) { + if ($(event.target).is(_this9._element)) { + _this9._ignoreBackdropClick = true; } }); }); - this._showBackdrop($.proxy(this._showElement, this, relatedTarget)); + this._showBackdrop(function () { + return _this9._showElement(relatedTarget); + }); }; Modal.prototype.hide = function hide(event) { + var _this10 = this; + if (event) { event.preventDefault(); } - var hideEvent = $.Event(Event.HIDE); + if (this._isTransitioning) { + throw new Error('Modal is transitioning'); + } + + var transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE); + if (transition) { + this._isTransitioning = true; + } + var hideEvent = $.Event(Event.HIDE); $(this._element).trigger(hideEvent); if (!this._isShown || hideEvent.isDefaultPrevented()) { @@ -1755,14 +1810,15 @@ var Modal = function ($) { $(document).off(Event.FOCUSIN); - $(this._element).removeClass(ClassName.IN); + $(this._element).removeClass(ClassName.SHOW); $(this._element).off(Event.CLICK_DISMISS); $(this._dialog).off(Event.MOUSEDOWN_DISMISS); - if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE)) { - - $(this._element).one(Util.TRANSITION_END, $.proxy(this._hideModal, this)).emulateTransitionEnd(TRANSITION_DURATION); + if (transition) { + $(this._element).one(Util.TRANSITION_END, function (event) { + return _this10._hideModal(event); + }).emulateTransitionEnd(TRANSITION_DURATION); } else { this._hideModal(); } @@ -1771,10 +1827,7 @@ var Modal = function ($) { Modal.prototype.dispose = function dispose() { $.removeData(this._element, DATA_KEY); - $(window).off(EVENT_KEY); - $(document).off(EVENT_KEY); - $(this._element).off(EVENT_KEY); - $(this._backdrop).off(EVENT_KEY); + $(window, document, this._element, this._backdrop).off(EVENT_KEY); this._config = null; this._element = null; @@ -1796,7 +1849,7 @@ var Modal = function ($) { }; Modal.prototype._showElement = function _showElement(relatedTarget) { - var _this8 = this; + var _this11 = this; var transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE); @@ -1813,7 +1866,7 @@ var Modal = function ($) { Util.reflow(this._element); } - $(this._element).addClass(ClassName.IN); + $(this._element).addClass(ClassName.SHOW); if (this._config.focus) { this._enforceFocus(); @@ -1824,10 +1877,11 @@ var Modal = function ($) { }); var transitionComplete = function transitionComplete() { - if (_this8._config.focus) { - _this8._element.focus(); + if (_this11._config.focus) { + _this11._element.focus(); } - $(_this8._element).trigger(shownEvent); + _this11._isTransitioning = false; + $(_this11._element).trigger(shownEvent); }; if (transition) { @@ -1838,23 +1892,23 @@ var Modal = function ($) { }; Modal.prototype._enforceFocus = function _enforceFocus() { - var _this9 = this; + var _this12 = this; $(document).off(Event.FOCUSIN) // guard against infinite focus loop .on(Event.FOCUSIN, function (event) { - if (document !== event.target && _this9._element !== event.target && !$(_this9._element).has(event.target).length) { - _this9._element.focus(); + if (document !== event.target && _this12._element !== event.target && !$(_this12._element).has(event.target).length) { + _this12._element.focus(); } }); }; Modal.prototype._setEscapeEvent = function _setEscapeEvent() { - var _this10 = this; + var _this13 = this; if (this._isShown && this._config.keyboard) { $(this._element).on(Event.KEYDOWN_DISMISS, function (event) { if (event.which === ESCAPE_KEYCODE) { - _this10.hide(); + _this13.hide(); } }); } else if (!this._isShown) { @@ -1863,23 +1917,28 @@ var Modal = function ($) { }; Modal.prototype._setResizeEvent = function _setResizeEvent() { + var _this14 = this; + if (this._isShown) { - $(window).on(Event.RESIZE, $.proxy(this._handleUpdate, this)); + $(window).on(Event.RESIZE, function (event) { + return _this14._handleUpdate(event); + }); } else { $(window).off(Event.RESIZE); } }; Modal.prototype._hideModal = function _hideModal() { - var _this11 = this; + var _this15 = this; this._element.style.display = 'none'; this._element.setAttribute('aria-hidden', 'true'); + this._isTransitioning = false; this._showBackdrop(function () { $(document.body).removeClass(ClassName.OPEN); - _this11._resetAdjustments(); - _this11._resetScrollbar(); - $(_this11._element).trigger(Event.HIDDEN); + _this15._resetAdjustments(); + _this15._resetScrollbar(); + $(_this15._element).trigger(Event.HIDDEN); }); }; @@ -1891,7 +1950,7 @@ var Modal = function ($) { }; Modal.prototype._showBackdrop = function _showBackdrop(callback) { - var _this12 = this; + var _this16 = this; var animate = $(this._element).hasClass(ClassName.FADE) ? ClassName.FADE : ''; @@ -1908,17 +1967,17 @@ var Modal = function ($) { $(this._backdrop).appendTo(document.body); $(this._element).on(Event.CLICK_DISMISS, function (event) { - if (_this12._ignoreBackdropClick) { - _this12._ignoreBackdropClick = false; + if (_this16._ignoreBackdropClick) { + _this16._ignoreBackdropClick = false; return; } if (event.target !== event.currentTarget) { return; } - if (_this12._config.backdrop === 'static') { - _this12._element.focus(); + if (_this16._config.backdrop === 'static') { + _this16._element.focus(); } else { - _this12.hide(); + _this16.hide(); } }); @@ -1926,7 +1985,7 @@ var Modal = function ($) { Util.reflow(this._backdrop); } - $(this._backdrop).addClass(ClassName.IN); + $(this._backdrop).addClass(ClassName.SHOW); if (!callback) { return; @@ -1939,10 +1998,10 @@ var Modal = function ($) { $(this._backdrop).one(Util.TRANSITION_END, callback).emulateTransitionEnd(BACKDROP_TRANSITION_DURATION); } else if (!this._isShown && this._backdrop) { - $(this._backdrop).removeClass(ClassName.IN); + $(this._backdrop).removeClass(ClassName.SHOW); var callbackRemove = function callbackRemove() { - _this12._removeBackdrop(); + _this16._removeBackdrop(); if (callback) { callback(); } @@ -2058,7 +2117,7 @@ var Modal = function ($) { */ $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { - var _this13 = this; + var _this17 = this; var target = void 0; var selector = Util.getSelectorFromElement(this); @@ -2069,7 +2128,7 @@ var Modal = function ($) { var config = $(target).data(DATA_KEY) ? 'toggle' : $.extend({}, $(target).data(), $(this).data()); - if (this.tagName === 'A') { + if (this.tagName === 'A' || this.tagName === 'AREA') { event.preventDefault(); } @@ -2080,8 +2139,8 @@ var Modal = function ($) { } $target.one(Event.HIDDEN, function () { - if ($(_this13).is(':visible')) { - _this13.focus(); + if ($(_this17).is(':visible')) { + _this17.focus(); } }); }); @@ -2107,7 +2166,7 @@ var Modal = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): scrollspy.js + * Bootstrap (v4.0.0-alpha.6): scrollspy.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2121,7 +2180,7 @@ var ScrollSpy = function ($) { */ var NAME = 'scrollspy'; - var VERSION = '4.0.0-alpha.5'; + var VERSION = '4.0.0-alpha.6'; var DATA_KEY = 'bs.scrollspy'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -2178,6 +2237,8 @@ var ScrollSpy = function ($) { var ScrollSpy = function () { function ScrollSpy(element, config) { + var _this18 = this; + _classCallCheck(this, ScrollSpy); this._element = element; @@ -2189,7 +2250,9 @@ var ScrollSpy = function ($) { this._activeTarget = null; this._scrollHeight = 0; - $(this._scrollElement).on(Event.SCROLL, $.proxy(this._process, this)); + $(this._scrollElement).on(Event.SCROLL, function (event) { + return _this18._process(event); + }); this.refresh(); this._process(); @@ -2200,7 +2263,7 @@ var ScrollSpy = function ($) { // public ScrollSpy.prototype.refresh = function refresh() { - var _this14 = this; + var _this19 = this; var autoMethod = this._scrollElement !== this._scrollElement.window ? OffsetMethod.POSITION : OffsetMethod.OFFSET; @@ -2233,8 +2296,8 @@ var ScrollSpy = function ($) { }).sort(function (a, b) { return a[0] - b[0]; }).forEach(function (item) { - _this14._offsets.push(item[0]); - _this14._targets.push(item[1]); + _this19._offsets.push(item[0]); + _this19._targets.push(item[1]); }); }; @@ -2272,17 +2335,21 @@ var ScrollSpy = function ($) { }; ScrollSpy.prototype._getScrollTop = function _getScrollTop() { - return this._scrollElement === window ? this._scrollElement.scrollY : this._scrollElement.scrollTop; + return this._scrollElement === window ? this._scrollElement.pageYOffset : this._scrollElement.scrollTop; }; ScrollSpy.prototype._getScrollHeight = function _getScrollHeight() { return this._scrollElement.scrollHeight || Math.max(document.body.scrollHeight, document.documentElement.scrollHeight); }; + ScrollSpy.prototype._getOffsetHeight = function _getOffsetHeight() { + return this._scrollElement === window ? window.innerHeight : this._scrollElement.offsetHeight; + }; + ScrollSpy.prototype._process = function _process() { var scrollTop = this._getScrollTop() + this._config.offset; var scrollHeight = this._getScrollHeight(); - var maxScroll = this._config.offset + scrollHeight - this._scrollElement.offsetHeight; + var maxScroll = this._config.offset + scrollHeight - this._getOffsetHeight(); if (this._scrollHeight !== scrollHeight) { this.refresh(); @@ -2294,9 +2361,10 @@ var ScrollSpy = function ($) { if (this._activeTarget !== target) { this._activate(target); } + return; } - if (this._activeTarget && scrollTop < this._offsets[0]) { + if (this._activeTarget && scrollTop < this._offsets[0] && this._offsets[0] > 0) { this._activeTarget = null; this._clear(); return; @@ -2329,7 +2397,7 @@ var ScrollSpy = function ($) { } else { // todo (fat) this is kinda sus... // recursively add actives to tested nav-links - $link.parents(Selector.LI).find(Selector.NAV_LINKS).addClass(ClassName.ACTIVE); + $link.parents(Selector.LI).find('> ' + Selector.NAV_LINKS).addClass(ClassName.ACTIVE); } $(this._scrollElement).trigger(Event.ACTIVATE, { @@ -2346,7 +2414,7 @@ var ScrollSpy = function ($) { 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 || null; + var _config = (typeof config === 'undefined' ? 'undefined' : _typeof(config)) === 'object' && config; if (!data) { data = new ScrollSpy(this, _config); @@ -2410,7 +2478,7 @@ var ScrollSpy = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): tab.js + * Bootstrap (v4.0.0-alpha.6): tab.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2424,7 +2492,7 @@ var Tab = function ($) { */ var NAME = 'tab'; - var VERSION = '4.0.0-alpha.5'; + var VERSION = '4.0.0-alpha.6'; var DATA_KEY = 'bs.tab'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -2442,15 +2510,16 @@ var Tab = function ($) { var ClassName = { DROPDOWN_MENU: 'dropdown-menu', ACTIVE: 'active', + DISABLED: 'disabled', FADE: 'fade', - IN: 'in' + SHOW: 'show' }; var Selector = { A: 'a', LI: 'li', DROPDOWN: '.dropdown', - UL: 'ul:not(.dropdown-menu)', + LIST: 'ul:not(.dropdown-menu), ol:not(.dropdown-menu), nav:not(.dropdown-menu)', FADE_CHILD: '> .nav-item .fade, > .fade', ACTIVE: '.active', ACTIVE_CHILD: '> .nav-item > .active, > .active', @@ -2477,19 +2546,19 @@ var Tab = function ($) { // public Tab.prototype.show = function show() { - var _this15 = this; + var _this20 = this; - if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && $(this._element).hasClass(ClassName.ACTIVE)) { + 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 ulElement = $(this._element).closest(Selector.UL)[0]; + var listElement = $(this._element).closest(Selector.LIST)[0]; var selector = Util.getSelectorFromElement(this._element); - if (ulElement) { - previous = $.makeArray($(ulElement).find(Selector.ACTIVE)); + if (listElement) { + previous = $.makeArray($(listElement).find(Selector.ACTIVE)); previous = previous[previous.length - 1]; } @@ -2515,11 +2584,11 @@ var Tab = function ($) { target = $(selector)[0]; } - this._activate(this._element, ulElement); + this._activate(this._element, listElement); var complete = function complete() { var hiddenEvent = $.Event(Event.HIDDEN, { - relatedTarget: _this15._element + relatedTarget: _this20._element }); var shownEvent = $.Event(Event.SHOWN, { @@ -2527,7 +2596,7 @@ var Tab = function ($) { }); $(previous).trigger(hiddenEvent); - $(_this15._element).trigger(shownEvent); + $(_this20._element).trigger(shownEvent); }; if (target) { @@ -2545,10 +2614,14 @@ var Tab = function ($) { // private Tab.prototype._activate = function _activate(element, container, callback) { + var _this21 = this; + var active = $(container).find(Selector.ACTIVE_CHILD)[0]; var isTransitioning = callback && Util.supportsTransitionEnd() && (active && $(active).hasClass(ClassName.FADE) || Boolean($(container).find(Selector.FADE_CHILD)[0])); - var complete = $.proxy(this._transitionComplete, this, element, active, isTransitioning, callback); + var complete = function complete() { + return _this21._transitionComplete(element, active, isTransitioning, callback); + }; if (active && isTransitioning) { $(active).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION); @@ -2557,7 +2630,7 @@ var Tab = function ($) { } if (active) { - $(active).removeClass(ClassName.IN); + $(active).removeClass(ClassName.SHOW); } }; @@ -2565,7 +2638,7 @@ var Tab = function ($) { if (active) { $(active).removeClass(ClassName.ACTIVE); - var dropdownChild = $(active).find(Selector.DROPDOWN_ACTIVE_CHILD)[0]; + var dropdownChild = $(active.parentNode).find(Selector.DROPDOWN_ACTIVE_CHILD)[0]; if (dropdownChild) { $(dropdownChild).removeClass(ClassName.ACTIVE); @@ -2579,7 +2652,7 @@ var Tab = function ($) { if (isTransitioning) { Util.reflow(element); - $(element).addClass(ClassName.IN); + $(element).addClass(ClassName.SHOW); } else { $(element).removeClass(ClassName.FADE); } @@ -2607,7 +2680,7 @@ var Tab = function ($) { var data = $this.data(DATA_KEY); if (!data) { - data = data = new Tab(this); + data = new Tab(this); $this.data(DATA_KEY, data); } @@ -2661,7 +2734,7 @@ var Tab = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): tooltip.js + * Bootstrap (v4.0.0-alpha.6): tooltip.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2672,7 +2745,7 @@ var Tooltip = function ($) { * Check for Tether dependency * Tether - http://tether.io/ */ - if (window.Tether === undefined) { + if (typeof Tether === 'undefined') { throw new Error('Bootstrap tooltips require Tether (http://tether.io/)'); } @@ -2683,7 +2756,7 @@ var Tooltip = function ($) { */ var NAME = 'tooltip'; - var VERSION = '4.0.0-alpha.5'; + var VERSION = '4.0.0-alpha.6'; var DATA_KEY = 'bs.tooltip'; var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; @@ -2700,7 +2773,8 @@ var Tooltip = function ($) { selector: false, placement: 'top', offset: '0 0', - constraints: [] + constraints: [], + container: false }; var DefaultType = { @@ -2713,7 +2787,8 @@ var Tooltip = function ($) { selector: '(string|boolean)', placement: '(string|function)', offset: 'string', - constraints: 'array' + constraints: 'array', + container: '(string|element|boolean)' }; var AttachmentMap = { @@ -2724,7 +2799,7 @@ var Tooltip = function ($) { }; var HoverState = { - IN: 'in', + SHOW: 'show', OUT: 'out' }; @@ -2743,7 +2818,7 @@ var Tooltip = function ($) { var ClassName = { FADE: 'fade', - IN: 'in' + SHOW: 'show' }; var Selector = { @@ -2778,6 +2853,7 @@ var Tooltip = function ($) { this._timeout = 0; this._hoverState = ''; this._activeTrigger = {}; + this._isTransitioning = false; this._tether = null; // protected @@ -2823,7 +2899,7 @@ var Tooltip = function ($) { } } else { - if ($(this.getTipElement()).hasClass(ClassName.IN)) { + if ($(this.getTipElement()).hasClass(ClassName.SHOW)) { this._leave(null, this); return; } @@ -2840,6 +2916,7 @@ var Tooltip = function ($) { $.removeData(this.element, this.constructor.DATA_KEY); $(this.element).off(this.constructor.EVENT_KEY); + $(this.element).closest('.modal').off('hide.bs.modal'); if (this.tip) { $(this.tip).remove(); @@ -2857,11 +2934,17 @@ var Tooltip = function ($) { }; Tooltip.prototype.show = function show() { - var _this16 = this; + var _this22 = this; - var showEvent = $.Event(this.constructor.Event.SHOW); + if ($(this.element).css('display') === 'none') { + throw new Error('Please use show on visible elements'); + } + var showEvent = $.Event(this.constructor.Event.SHOW); if (this.isWithContent() && this._isEnabled) { + if (this._isTransitioning) { + throw new Error('Tooltip is transitioning'); + } $(this.element).trigger(showEvent); var isInTheDom = $.contains(this.element.ownerDocument.documentElement, this.element); @@ -2886,7 +2969,9 @@ var Tooltip = function ($) { var attachment = this._getAttachment(placement); - $(tip).data(this.constructor.DATA_KEY, this).appendTo(document.body); + var container = this.config.container === false ? document.body : $(this.config.container); + + $(tip).data(this.constructor.DATA_KEY, this).appendTo(container); $(this.element).trigger(this.constructor.Event.INSERTED); @@ -2904,20 +2989,22 @@ var Tooltip = function ($) { Util.reflow(tip); this._tether.position(); - $(tip).addClass(ClassName.IN); + $(tip).addClass(ClassName.SHOW); var complete = function complete() { - var prevHoverState = _this16._hoverState; - _this16._hoverState = null; + var prevHoverState = _this22._hoverState; + _this22._hoverState = null; + _this22._isTransitioning = false; - $(_this16.element).trigger(_this16.constructor.Event.SHOWN); + $(_this22.element).trigger(_this22.constructor.Event.SHOWN); if (prevHoverState === HoverState.OUT) { - _this16._leave(null, _this16); + _this22._leave(null, _this22); } }; if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { + this._isTransitioning = true; $(this.tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(Tooltip._TRANSITION_DURATION); return; } @@ -2927,18 +3014,22 @@ var Tooltip = function ($) { }; Tooltip.prototype.hide = function hide(callback) { - var _this17 = this; + var _this23 = this; var tip = this.getTipElement(); var hideEvent = $.Event(this.constructor.Event.HIDE); + if (this._isTransitioning) { + throw new Error('Tooltip is transitioning'); + } var complete = function complete() { - if (_this17._hoverState !== HoverState.IN && tip.parentNode) { + if (_this23._hoverState !== HoverState.SHOW && tip.parentNode) { tip.parentNode.removeChild(tip); } - _this17.element.removeAttribute('aria-describedby'); - $(_this17.element).trigger(_this17.constructor.Event.HIDDEN); - _this17.cleanupTether(); + _this23.element.removeAttribute('aria-describedby'); + $(_this23.element).trigger(_this23.constructor.Event.HIDDEN); + _this23._isTransitioning = false; + _this23.cleanupTether(); if (callback) { callback(); @@ -2951,10 +3042,14 @@ var Tooltip = function ($) { return; } - $(tip).removeClass(ClassName.IN); + $(tip).removeClass(ClassName.SHOW); - if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { + this._activeTrigger[Trigger.CLICK] = false; + this._activeTrigger[Trigger.FOCUS] = false; + this._activeTrigger[Trigger.HOVER] = false; + if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { + this._isTransitioning = true; $(tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION); } else { complete(); @@ -2978,7 +3073,7 @@ var Tooltip = function ($) { this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle()); - $tip.removeClass(ClassName.FADE).removeClass(ClassName.IN); + $tip.removeClass(ClassName.FADE + ' ' + ClassName.SHOW); this.cleanupTether(); }; @@ -3022,19 +3117,29 @@ var Tooltip = function ($) { }; Tooltip.prototype._setListeners = function _setListeners() { - var _this18 = this; + var _this24 = this; var triggers = this.config.trigger.split(' '); triggers.forEach(function (trigger) { if (trigger === 'click') { - $(_this18.element).on(_this18.constructor.Event.CLICK, _this18.config.selector, $.proxy(_this18.toggle, _this18)); + $(_this24.element).on(_this24.constructor.Event.CLICK, _this24.config.selector, function (event) { + return _this24.toggle(event); + }); } else if (trigger !== Trigger.MANUAL) { - var eventIn = trigger === Trigger.HOVER ? _this18.constructor.Event.MOUSEENTER : _this18.constructor.Event.FOCUSIN; - var eventOut = trigger === Trigger.HOVER ? _this18.constructor.Event.MOUSELEAVE : _this18.constructor.Event.FOCUSOUT; + var eventIn = trigger === Trigger.HOVER ? _this24.constructor.Event.MOUSEENTER : _this24.constructor.Event.FOCUSIN; + var eventOut = trigger === Trigger.HOVER ? _this24.constructor.Event.MOUSELEAVE : _this24.constructor.Event.FOCUSOUT; - $(_this18.element).on(eventIn, _this18.config.selector, $.proxy(_this18._enter, _this18)).on(eventOut, _this18.config.selector, $.proxy(_this18._leave, _this18)); + $(_this24.element).on(eventIn, _this24.config.selector, function (event) { + return _this24._enter(event); + }).on(eventOut, _this24.config.selector, function (event) { + return _this24._leave(event); + }); } + + $(_this24.element).closest('.modal').on('hide.bs.modal', function () { + return _this24.hide(); + }); }); if (this.config.selector) { @@ -3069,14 +3174,14 @@ var Tooltip = function ($) { context._activeTrigger[event.type === 'focusin' ? Trigger.FOCUS : Trigger.HOVER] = true; } - if ($(context.getTipElement()).hasClass(ClassName.IN) || context._hoverState === HoverState.IN) { - context._hoverState = HoverState.IN; + if ($(context.getTipElement()).hasClass(ClassName.SHOW) || context._hoverState === HoverState.SHOW) { + context._hoverState = HoverState.SHOW; return; } clearTimeout(context._timeout); - context._hoverState = HoverState.IN; + context._hoverState = HoverState.SHOW; if (!context.config.delay || !context.config.delay.show) { context.show(); @@ -3084,7 +3189,7 @@ var Tooltip = function ($) { } context._timeout = setTimeout(function () { - if (context._hoverState === HoverState.IN) { + if (context._hoverState === HoverState.SHOW) { context.show(); } }, context.config.delay.show); @@ -3168,7 +3273,7 @@ var Tooltip = function ($) { 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 : null; + var _config = (typeof config === 'undefined' ? 'undefined' : _typeof(config)) === 'object' && config; if (!data && /dispose|hide/.test(config)) { return; @@ -3246,7 +3351,7 @@ var Tooltip = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): popover.js + * Bootstrap (v4.0.0-alpha.6): popover.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -3260,7 +3365,7 @@ var Popover = function ($) { */ var NAME = 'popover'; - var VERSION = '4.0.0-alpha.5'; + var VERSION = '4.0.0-alpha.6'; var DATA_KEY = 'bs.popover'; var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; @@ -3278,7 +3383,7 @@ var Popover = function ($) { var ClassName = { FADE: 'fade', - IN: 'in' + SHOW: 'show' }; var Selector = { @@ -3331,7 +3436,7 @@ var Popover = function ($) { this.setElementContent($tip.find(Selector.TITLE), this.getTitle()); this.setElementContent($tip.find(Selector.CONTENT), this._getContent()); - $tip.removeClass(ClassName.FADE).removeClass(ClassName.IN); + $tip.removeClass(ClassName.FADE + ' ' + ClassName.SHOW); this.cleanupTether(); }; |