From 6d6538fc81ebdb9e29ca5a5a4e8e5768b9358fe9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2016 19:44:11 -0700 Subject: grunt --- docs/dist/js/bootstrap.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index b17302209..06386b7d9 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -1031,7 +1031,7 @@ var Collapse = function ($) { }; var Selector = { - ACTIVES: '.panel > .in, .panel > .collapsing', + ACTIVES: '.card > .in, .card > .collapsing', DATA_TOGGLE: '[data-toggle="collapse"]' }; @@ -3170,7 +3170,7 @@ var Tooltip = function ($) { var data = $(this).data(DATA_KEY); var _config = (typeof config === 'undefined' ? 'undefined' : _typeof(config)) === 'object' ? config : null; - if (!data && /destroy|hide/.test(config)) { + if (!data && /dispose|hide/.test(config)) { return; } -- cgit v1.2.3 From 8ff7edaab4f55b6612df3fe670aa9b9ac0984eae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Oct 2016 08:27:41 -0700 Subject: version bump to alpha 5 --- docs/dist/js/bootstrap.js | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 06386b7d9..063bb7a6b 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -1,5 +1,5 @@ /*! - * Bootstrap v4.0.0-alpha.4 (https://getbootstrap.com) + * Bootstrap v4.0.0-alpha.5 (https://getbootstrap.com) * Copyright 2011-2016 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -30,7 +30,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): util.js + * Bootstrap (v4.0.0-alpha.5): util.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -185,7 +185,7 @@ var Util = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): alert.js + * Bootstrap (v4.0.0-alpha.5): alert.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -199,7 +199,7 @@ var Alert = function ($) { */ var NAME = 'alert'; - var VERSION = '4.0.0-alpha.4'; + var VERSION = '4.0.0-alpha.5'; var DATA_KEY = 'bs.alert'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -360,7 +360,7 @@ var Alert = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): button.js + * Bootstrap (v4.0.0-alpha.5): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -374,7 +374,7 @@ var Button = function ($) { */ var NAME = 'button'; - var VERSION = '4.0.0-alpha.4'; + var VERSION = '4.0.0-alpha.5'; var DATA_KEY = 'bs.button'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -523,7 +523,7 @@ var Button = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): carousel.js + * Bootstrap (v4.0.0-alpha.5): carousel.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -537,7 +537,7 @@ var Carousel = function ($) { */ var NAME = 'carousel'; - var VERSION = '4.0.0-alpha.4'; + var VERSION = '4.0.0-alpha.5'; var DATA_KEY = 'bs.carousel'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -979,7 +979,7 @@ var Carousel = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): collapse.js + * Bootstrap (v4.0.0-alpha.5): collapse.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -993,7 +993,7 @@ var Collapse = function ($) { */ var NAME = 'collapse'; - var VERSION = '4.0.0-alpha.4'; + var VERSION = '4.0.0-alpha.5'; var DATA_KEY = 'bs.collapse'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -1323,7 +1323,7 @@ var Collapse = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): dropdown.js + * Bootstrap (v4.0.0-alpha.5): dropdown.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -1337,7 +1337,7 @@ var Dropdown = function ($) { */ var NAME = 'dropdown'; - var VERSION = '4.0.0-alpha.4'; + var VERSION = '4.0.0-alpha.5'; var DATA_KEY = 'bs.dropdown'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -1604,7 +1604,7 @@ var Dropdown = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): modal.js + * Bootstrap (v4.0.0-alpha.5): modal.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -1618,7 +1618,7 @@ var Modal = function ($) { */ var NAME = 'modal'; - var VERSION = '4.0.0-alpha.4'; + var VERSION = '4.0.0-alpha.5'; var DATA_KEY = 'bs.modal'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -2107,7 +2107,7 @@ var Modal = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): scrollspy.js + * Bootstrap (v4.0.0-alpha.5): scrollspy.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2121,7 +2121,7 @@ var ScrollSpy = function ($) { */ var NAME = 'scrollspy'; - var VERSION = '4.0.0-alpha.4'; + var VERSION = '4.0.0-alpha.5'; var DATA_KEY = 'bs.scrollspy'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -2410,7 +2410,7 @@ var ScrollSpy = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): tab.js + * Bootstrap (v4.0.0-alpha.5): tab.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2424,7 +2424,7 @@ var Tab = function ($) { */ var NAME = 'tab'; - var VERSION = '4.0.0-alpha.4'; + var VERSION = '4.0.0-alpha.5'; var DATA_KEY = 'bs.tab'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -2661,7 +2661,7 @@ var Tab = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): tooltip.js + * Bootstrap (v4.0.0-alpha.5): tooltip.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2683,7 +2683,7 @@ var Tooltip = function ($) { */ var NAME = 'tooltip'; - var VERSION = '4.0.0-alpha.4'; + var VERSION = '4.0.0-alpha.5'; var DATA_KEY = 'bs.tooltip'; var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; @@ -3246,7 +3246,7 @@ var Tooltip = function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): popover.js + * Bootstrap (v4.0.0-alpha.5): popover.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -3260,7 +3260,7 @@ var Popover = function ($) { */ var NAME = 'popover'; - var VERSION = '4.0.0-alpha.4'; + var VERSION = '4.0.0-alpha.5'; var DATA_KEY = 'bs.popover'; var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; -- cgit v1.2.3 From 9dbfc90eae7b1eda2b0e0b501a7e223d0cce688c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Oct 2016 09:51:22 -0700 Subject: grunt --- docs/dist/js/bootstrap.js | 80 +++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 063bb7a6b..daa7668cc 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -219,7 +219,7 @@ var Alert = function ($) { var ClassName = { ALERT: 'alert', FADE: 'fade', - IN: 'in' + ACTIVE: 'active' }; /** @@ -282,7 +282,7 @@ var Alert = function ($) { }; Alert.prototype._removeElement = function _removeElement(element) { - $(element).removeClass(ClassName.IN); + $(element).removeClass(ClassName.ACTIVE); if (!Util.supportsTransitionEnd() || !$(element).hasClass(ClassName.FADE)) { this._destroyElement(element); @@ -1019,7 +1019,7 @@ var Collapse = function ($) { }; var ClassName = { - IN: 'in', + ACTIVE: 'active', COLLAPSE: 'collapse', COLLAPSING: 'collapsing', COLLAPSED: 'collapsed' @@ -1031,7 +1031,7 @@ var Collapse = function ($) { }; var Selector = { - ACTIVES: '.card > .in, .card > .collapsing', + ACTIVES: '.card > .active, .card > .collapsing', DATA_TOGGLE: '[data-toggle="collapse"]' }; @@ -1066,7 +1066,7 @@ var Collapse = function ($) { // public Collapse.prototype.toggle = function toggle() { - if ($(this._element).hasClass(ClassName.IN)) { + if ($(this._element).hasClass(ClassName.ACTIVE)) { this.hide(); } else { this.show(); @@ -1076,7 +1076,7 @@ var Collapse = function ($) { Collapse.prototype.show = function show() { var _this4 = this; - if (this._isTransitioning || $(this._element).hasClass(ClassName.IN)) { + if (this._isTransitioning || $(this._element).hasClass(ClassName.ACTIVE)) { return; } @@ -1084,7 +1084,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,7 +1124,7 @@ var Collapse = function ($) { this.setTransitioning(true); var complete = function complete() { - $(_this4._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).addClass(ClassName.IN); + $(_this4._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).addClass(ClassName.ACTIVE); _this4._element.style[dimension] = ''; @@ -1149,7 +1149,7 @@ var Collapse = function ($) { Collapse.prototype.hide = function hide() { var _this5 = this; - if (this._isTransitioning || !$(this._element).hasClass(ClassName.IN)) { + if (this._isTransitioning || !$(this._element).hasClass(ClassName.ACTIVE)) { return; } @@ -1166,7 +1166,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.ACTIVE); this._element.setAttribute('aria-expanded', false); @@ -1234,7 +1234,7 @@ var Collapse = function ($) { Collapse.prototype._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) { if (element) { - var isOpen = $(element).hasClass(ClassName.IN); + var isOpen = $(element).hasClass(ClassName.ACTIVE); element.setAttribute('aria-expanded', isOpen); if (triggerArray.length) { @@ -1360,7 +1360,7 @@ var Dropdown = function ($) { var ClassName = { BACKDROP: 'dropdown-backdrop', DISABLED: 'disabled', - OPEN: 'open' + ACTIVE: 'active' }; var Selector = { @@ -1398,7 +1398,7 @@ var Dropdown = function ($) { } var parent = Dropdown._getParentFromElement(this); - var isActive = $(parent).hasClass(ClassName.OPEN); + var isActive = $(parent).hasClass(ClassName.ACTIVE); Dropdown._clearMenus(); @@ -1427,7 +1427,7 @@ var Dropdown = function ($) { this.focus(); this.setAttribute('aria-expanded', 'true'); - $(parent).toggleClass(ClassName.OPEN); + $(parent).toggleClass(ClassName.ACTIVE); $(parent).trigger($.Event(Event.SHOWN, relatedTarget)); return false; @@ -1480,7 +1480,7 @@ var Dropdown = function ($) { var parent = Dropdown._getParentFromElement(toggles[i]); var relatedTarget = { relatedTarget: toggles[i] }; - if (!$(parent).hasClass(ClassName.OPEN)) { + if (!$(parent).hasClass(ClassName.ACTIVE)) { continue; } @@ -1496,7 +1496,7 @@ var Dropdown = function ($) { toggles[i].setAttribute('aria-expanded', 'false'); - $(parent).removeClass(ClassName.OPEN).trigger($.Event(Event.HIDDEN, relatedTarget)); + $(parent).removeClass(ClassName.ACTIVE).trigger($.Event(Event.HIDDEN, relatedTarget)); } }; @@ -1524,7 +1524,7 @@ var Dropdown = function ($) { } var parent = Dropdown._getParentFromElement(this); - var isActive = $(parent).hasClass(ClassName.OPEN); + var isActive = $(parent).hasClass(ClassName.ACTIVE); if (!isActive && event.which !== ESCAPE_KEYCODE || isActive && event.which === ESCAPE_KEYCODE) { @@ -1660,7 +1660,7 @@ var Modal = function ($) { BACKDROP: 'modal-backdrop', OPEN: 'modal-open', FADE: 'fade', - IN: 'in' + ACTIVE: 'active' }; var Selector = { @@ -1755,7 +1755,7 @@ var Modal = function ($) { $(document).off(Event.FOCUSIN); - $(this._element).removeClass(ClassName.IN); + $(this._element).removeClass(ClassName.ACTIVE); $(this._element).off(Event.CLICK_DISMISS); $(this._dialog).off(Event.MOUSEDOWN_DISMISS); @@ -1813,7 +1813,7 @@ var Modal = function ($) { Util.reflow(this._element); } - $(this._element).addClass(ClassName.IN); + $(this._element).addClass(ClassName.ACTIVE); if (this._config.focus) { this._enforceFocus(); @@ -1926,7 +1926,7 @@ var Modal = function ($) { Util.reflow(this._backdrop); } - $(this._backdrop).addClass(ClassName.IN); + $(this._backdrop).addClass(ClassName.ACTIVE); if (!callback) { return; @@ -1939,7 +1939,7 @@ 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.ACTIVE); var callbackRemove = function callbackRemove() { _this12._removeBackdrop(); @@ -2450,7 +2450,7 @@ var Tab = function ($) { A: 'a', LI: 'li', DROPDOWN: '.dropdown', - UL: 'ul:not(.dropdown-menu)', + LIST: 'ul:not(.dropdown-menu), ol:not(.dropdown-menu)', FADE_CHILD: '> .nav-item .fade, > .fade', ACTIVE: '.active', ACTIVE_CHILD: '> .nav-item > .active, > .active', @@ -2485,11 +2485,11 @@ var Tab = function ($) { 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,7 +2515,7 @@ 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, { @@ -2724,7 +2724,7 @@ var Tooltip = function ($) { }; var HoverState = { - IN: 'in', + ACTIVE: 'active', OUT: 'out' }; @@ -2743,7 +2743,7 @@ var Tooltip = function ($) { var ClassName = { FADE: 'fade', - IN: 'in' + ACTIVE: 'active' }; var Selector = { @@ -2823,7 +2823,7 @@ var Tooltip = function ($) { } } else { - if ($(this.getTipElement()).hasClass(ClassName.IN)) { + if ($(this.getTipElement()).hasClass(ClassName.ACTIVE)) { this._leave(null, this); return; } @@ -2904,7 +2904,7 @@ var Tooltip = function ($) { Util.reflow(tip); this._tether.position(); - $(tip).addClass(ClassName.IN); + $(tip).addClass(ClassName.ACTIVE); var complete = function complete() { var prevHoverState = _this16._hoverState; @@ -2932,7 +2932,7 @@ var Tooltip = function ($) { var tip = this.getTipElement(); var hideEvent = $.Event(this.constructor.Event.HIDE); var complete = function complete() { - if (_this17._hoverState !== HoverState.IN && tip.parentNode) { + if (_this17._hoverState !== HoverState.ACTIVE && tip.parentNode) { tip.parentNode.removeChild(tip); } @@ -2951,7 +2951,7 @@ var Tooltip = function ($) { return; } - $(tip).removeClass(ClassName.IN); + $(tip).removeClass(ClassName.ACTIVE); if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { @@ -2978,7 +2978,7 @@ var Tooltip = function ($) { this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle()); - $tip.removeClass(ClassName.FADE).removeClass(ClassName.IN); + $tip.removeClass(ClassName.FADE).removeClass(ClassName.ACTIVE); this.cleanupTether(); }; @@ -3069,14 +3069,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.ACTIVE) || context._hoverState === HoverState.ACTIVE) { + context._hoverState = HoverState.ACTIVE; return; } clearTimeout(context._timeout); - context._hoverState = HoverState.IN; + context._hoverState = HoverState.ACTIVE; if (!context.config.delay || !context.config.delay.show) { context.show(); @@ -3084,7 +3084,7 @@ var Tooltip = function ($) { } context._timeout = setTimeout(function () { - if (context._hoverState === HoverState.IN) { + if (context._hoverState === HoverState.ACTIVE) { context.show(); } }, context.config.delay.show); @@ -3278,7 +3278,7 @@ var Popover = function ($) { var ClassName = { FADE: 'fade', - IN: 'in' + ACTIVE: 'active' }; var Selector = { @@ -3331,7 +3331,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).removeClass(ClassName.ACTIVE); this.cleanupTether(); }; -- cgit v1.2.3 From d1171ac44ad05a1b7244900b690840093d3e5573 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Oct 2016 15:21:53 -0700 Subject: grunt --- docs/dist/js/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index daa7668cc..8574d0aa4 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -149,7 +149,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); -- cgit v1.2.3 From cd5c7a2263c33e7c4fe7f5db205ff93fbe17750f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 31 Oct 2016 21:36:10 -0700 Subject: grunt --- docs/dist/js/bootstrap.js | 189 ++++++++++++++++++++++++++++------------------ 1 file changed, 115 insertions(+), 74 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 8574d0aa4..fe7545490 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -282,6 +282,8 @@ var Alert = function ($) { }; Alert.prototype._removeElement = function _removeElement(element) { + var _this2 = this; + $(element).removeClass(ClassName.ACTIVE); if (!Util.supportsTransitionEnd() || !$(element).hasClass(ClassName.FADE)) { @@ -289,7 +291,9 @@ var Alert = function ($) { 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) { @@ -668,12 +672,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 +689,7 @@ var Carousel = function ($) { if (this._isSliding) { $(this._element).one(Event.SLID, function () { - return _this2.to(index); + return _this3.to(index); }); return; } @@ -724,12 +728,20 @@ 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); + }); } }; @@ -798,7 +810,7 @@ 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); @@ -851,10 +863,10 @@ var Carousel = function ($) { $(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 { @@ -1074,7 +1086,7 @@ var Collapse = function ($) { }; Collapse.prototype.show = function show() { - var _this4 = this; + var _this6 = this; if (this._isTransitioning || $(this._element).hasClass(ClassName.ACTIVE)) { return; @@ -1124,13 +1136,13 @@ var Collapse = function ($) { this.setTransitioning(true); var complete = function complete() { - $(_this4._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).addClass(ClassName.ACTIVE); + $(_this6._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).addClass(ClassName.ACTIVE); - _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,7 +1159,7 @@ var Collapse = function ($) { }; Collapse.prototype.hide = function hide() { - var _this5 = this; + var _this7 = this; if (this._isTransitioning || !$(this._element).hasClass(ClassName.ACTIVE)) { return; @@ -1177,8 +1189,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 +1232,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; @@ -1700,7 +1712,7 @@ var Modal = function ($) { }; Modal.prototype.show = function show(relatedTarget) { - var _this7 = this; + var _this9 = this; var showEvent = $.Event(Event.SHOW, { relatedTarget: relatedTarget @@ -1722,20 +1734,26 @@ 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(); } @@ -1762,7 +1780,9 @@ var Modal = function ($) { if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE)) { - $(this._element).one(Util.TRANSITION_END, $.proxy(this._hideModal, this)).emulateTransitionEnd(TRANSITION_DURATION); + $(this._element).one(Util.TRANSITION_END, function (event) { + return _this10._hideModal(event); + }).emulateTransitionEnd(TRANSITION_DURATION); } else { this._hideModal(); } @@ -1796,7 +1816,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); @@ -1824,10 +1844,10 @@ 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._element).trigger(shownEvent); }; if (transition) { @@ -1838,23 +1858,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 +1883,27 @@ 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._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 +1915,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 +1932,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(); } }); @@ -1942,7 +1966,7 @@ var Modal = function ($) { $(this._backdrop).removeClass(ClassName.ACTIVE); var callbackRemove = function callbackRemove() { - _this12._removeBackdrop(); + _this16._removeBackdrop(); if (callback) { callback(); } @@ -2058,7 +2082,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); @@ -2080,8 +2104,8 @@ var Modal = function ($) { } $target.one(Event.HIDDEN, function () { - if ($(_this13).is(':visible')) { - _this13.focus(); + if ($(_this17).is(':visible')) { + _this17.focus(); } }); }); @@ -2178,6 +2202,8 @@ var ScrollSpy = function ($) { var ScrollSpy = function () { function ScrollSpy(element, config) { + var _this18 = this; + _classCallCheck(this, ScrollSpy); this._element = element; @@ -2189,7 +2215,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 +2228,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 +2261,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]); }); }; @@ -2477,7 +2505,7 @@ 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)) { return; @@ -2519,7 +2547,7 @@ var Tab = function ($) { var complete = function complete() { var hiddenEvent = $.Event(Event.HIDDEN, { - relatedTarget: _this15._element + relatedTarget: _this20._element }); var shownEvent = $.Event(Event.SHOWN, { @@ -2527,7 +2555,7 @@ var Tab = function ($) { }); $(previous).trigger(hiddenEvent); - $(_this15._element).trigger(shownEvent); + $(_this20._element).trigger(shownEvent); }; if (target) { @@ -2545,10 +2573,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); @@ -2857,8 +2889,11 @@ var Tooltip = function ($) { }; Tooltip.prototype.show = function show() { - var _this16 = this; + var _this22 = this; + 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) { @@ -2907,13 +2942,13 @@ var Tooltip = function ($) { $(tip).addClass(ClassName.ACTIVE); var complete = function complete() { - var prevHoverState = _this16._hoverState; - _this16._hoverState = null; + var prevHoverState = _this22._hoverState; + _this22._hoverState = null; - $(_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); } }; @@ -2927,18 +2962,18 @@ 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); var complete = function complete() { - if (_this17._hoverState !== HoverState.ACTIVE && tip.parentNode) { + if (_this23._hoverState !== HoverState.ACTIVE && 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.cleanupTether(); if (callback) { callback(); @@ -3022,18 +3057,24 @@ 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; - - $(_this18.element).on(eventIn, _this18.config.selector, $.proxy(_this18._enter, _this18)).on(eventOut, _this18.config.selector, $.proxy(_this18._leave, _this18)); + 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; + + $(_this24.element).on(eventIn, _this24.config.selector, function (event) { + return _this24._enter(event); + }).on(eventOut, _this24.config.selector, function (event) { + return _this24._leave(event); + }); } }); -- cgit v1.2.3 From 49be9bc63af9391721287c189bf2f9150aad15bc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 25 Nov 2016 15:00:23 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index fe7545490..0ad3e6d7a 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -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; }, @@ -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 + '".')); @@ -1427,7 +1422,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); @@ -1437,7 +1434,7 @@ var Dropdown = function ($) { } this.focus(); - this.setAttribute('aria-expanded', 'true'); + this.setAttribute('aria-expanded', true); $(parent).toggleClass(ClassName.ACTIVE); $(parent).trigger($.Event(Event.SHOWN, relatedTarget)); @@ -1464,7 +1461,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') { @@ -1490,7 +1488,9 @@ 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.ACTIVE)) { continue; @@ -1898,7 +1898,7 @@ var Modal = function ($) { var _this15 = this; this._element.style.display = 'none'; - this._element.setAttribute('aria-hidden', 'true'); + this._element.setAttribute('aria-hidden', true); this._showBackdrop(function () { $(document.body).removeClass(ClassName.OPEN); _this15._resetAdjustments(); @@ -2374,7 +2374,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); @@ -2597,7 +2597,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); @@ -2639,7 +2639,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); } @@ -3209,7 +3209,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; -- cgit v1.2.3 From f2b98f6b2c52d6132524036bc327baee2eda3a48 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 25 Nov 2016 17:40:44 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 0ad3e6d7a..3778498fa 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -2307,10 +2307,14 @@ var ScrollSpy = function ($) { 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(); @@ -2322,6 +2326,7 @@ var ScrollSpy = function ($) { if (this._activeTarget !== target) { this._activate(target); } + return; } if (this._activeTarget && scrollTop < this._offsets[0]) { -- cgit v1.2.3 From e953d5d4f05fe2812defe1c2888bc6fe0b2f75e8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 26 Nov 2016 00:40:17 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 3778498fa..67fae25e3 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -1549,11 +1549,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; -- cgit v1.2.3 From 19ab4873ff0d670b909025faf438f92a9e5f3e4e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 26 Nov 2016 01:00:16 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 67fae25e3..4731cd691 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -2089,7 +2089,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(); } -- cgit v1.2.3 From c7b8451cdcd4930ba58af27a51d4247d1114a59b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 26 Nov 2016 11:16:53 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 4731cd691..35c22c59b 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -437,7 +437,7 @@ var Button = function ($) { if (triggerChangeEvent) { input.checked = !$(this._element).hasClass(ClassName.ACTIVE); - $(this._element).trigger('change'); + $(input).trigger('change'); } input.focus(); @@ -741,11 +741,10 @@ var Carousel = function ($) { }; Carousel.prototype._keydown = function _keydown(event) { - event.preventDefault(); - if (/input|textarea/i.test(event.target.tagName)) { return; } + event.preventDefault(); switch (event.which) { case ARROW_LEFT_KEYCODE: -- cgit v1.2.3 From 0b8a2819201076a8e93cd387aecf13d8c419990e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 26 Nov 2016 19:17:23 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 35c22c59b..d871f4083 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -5,7 +5,7 @@ */ 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 ($) { @@ -2732,7 +2732,8 @@ var Tooltip = function ($) { selector: false, placement: 'top', offset: '0 0', - constraints: [] + constraints: [], + container: false }; var DefaultType = { @@ -2745,7 +2746,8 @@ var Tooltip = function ($) { selector: '(string|boolean)', placement: '(string|function)', offset: 'string', - constraints: 'array' + constraints: 'array', + container: '(string|element|boolean)' }; var AttachmentMap = { @@ -2921,7 +2923,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); -- cgit v1.2.3 From d6c1fa37bd6dd9bb99fc3c18750c76a3d8c0a3b3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 28 Nov 2016 13:36:46 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index d871f4083..d74a4b159 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -2324,7 +2324,7 @@ var ScrollSpy = function ($) { 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; -- cgit v1.2.3 From c3ffe135537f06229a74a58b881f7e2417d5c118 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 28 Nov 2016 13:40:47 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index d74a4b159..7794844b3 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -851,11 +851,9 @@ var Carousel = function ($) { $(nextElement).addClass(directionalClassName); $(activeElement).one(Util.TRANSITION_END, function () { - $(nextElement).removeClass(directionalClassName).removeClass(direction); + $(nextElement).removeClass(directionalClassName + ' ' + direction).addClass(ClassName.ACTIVE); - $(nextElement).addClass(ClassName.ACTIVE); - - $(activeElement).removeClass(ClassName.ACTIVE).removeClass(direction).removeClass(directionalClassName); + $(activeElement).removeClass(ClassName.ACTIVE + ' ' + direction + ' ' + directionalClassName); _this5._isSliding = false; @@ -3017,7 +3015,7 @@ var Tooltip = function ($) { this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle()); - $tip.removeClass(ClassName.FADE).removeClass(ClassName.ACTIVE); + $tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE); this.cleanupTether(); }; @@ -3376,7 +3374,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.ACTIVE); + $tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE); this.cleanupTether(); }; -- cgit v1.2.3 From 9749bab4ce07c655231cc13c1539f37d751e856b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 28 Nov 2016 17:18:44 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 7794844b3..58057521c 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -1784,10 +1784,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; -- cgit v1.2.3 From 3ec37d4a4d043ded903c807818e7894de084409f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Dec 2016 10:13:36 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 66 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 12 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 58057521c..6a384fcc9 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -624,9 +624,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() { @@ -637,9 +638,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) { @@ -1080,7 +1082,11 @@ var Collapse = function ($) { Collapse.prototype.show = function show() { var _this6 = this; - if (this._isTransitioning || $(this._element).hasClass(ClassName.ACTIVE)) { + if (this._isTransitioning) { + throw new Error('Collapse is transitioning'); + } + + if ($(this._element).hasClass(ClassName.ACTIVE)) { return; } @@ -1153,7 +1159,11 @@ var Collapse = function ($) { Collapse.prototype.hide = function hide() { var _this7 = this; - if (this._isTransitioning || !$(this._element).hasClass(ClassName.ACTIVE)) { + if (this._isTransitioning) { + throw new Error('Collapse is transitioning'); + } + + if (!$(this._element).hasClass(ClassName.ACTIVE)) { return; } @@ -1692,6 +1702,7 @@ var Modal = function ($) { this._isShown = false; this._isBodyOverflowing = false; this._ignoreBackdropClick = false; + this._isTransitioning = false; this._originalBodyPadding = 0; this._scrollbarWidth = 0; } @@ -1707,6 +1718,13 @@ var Modal = function ($) { Modal.prototype.show = function show(relatedTarget) { 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 }); @@ -1751,8 +1769,16 @@ var Modal = function ($) { 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()) { @@ -1771,8 +1797,7 @@ var Modal = function ($) { $(this._element).off(Event.CLICK_DISMISS); $(this._dialog).off(Event.MOUSEDOWN_DISMISS); - if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE)) { - + if (transition) { $(this._element).one(Util.TRANSITION_END, function (event) { return _this10._hideModal(event); }).emulateTransitionEnd(TRANSITION_DURATION); @@ -1837,6 +1862,7 @@ var Modal = function ($) { if (_this11._config.focus) { _this11._element.focus(); } + _this11._isTransitioning = false; $(_this11._element).trigger(shownEvent); }; @@ -1888,7 +1914,8 @@ var Modal = function ($) { var _this15 = this; this._element.style.display = 'none'; - this._element.setAttribute('aria-hidden', true); + this._element.setAttribute('aria-hidden', 'true'); + this._isTransitioning = false; this._showBackdrop(function () { $(document.body).removeClass(ClassName.OPEN); _this15._resetAdjustments(); @@ -2807,6 +2834,7 @@ var Tooltip = function ($) { this._timeout = 0; this._hoverState = ''; this._activeTrigger = {}; + this._isTransitioning = false; this._tether = null; // protected @@ -2869,6 +2897,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(); @@ -2891,9 +2920,12 @@ var Tooltip = function ($) { if ($(this.element).css('display') === 'none') { throw new Error('Please use show on visible elements'); } - var showEvent = $.Event(this.constructor.Event.SHOW); + 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); @@ -2943,6 +2975,7 @@ var Tooltip = function ($) { var complete = function complete() { var prevHoverState = _this22._hoverState; _this22._hoverState = null; + _this22._isTransitioning = false; $(_this22.element).trigger(_this22.constructor.Event.SHOWN); @@ -2952,6 +2985,7 @@ var Tooltip = function ($) { }; if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { + this._isTransitioning = true; $(this.tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(Tooltip._TRANSITION_DURATION); return; } @@ -2965,6 +2999,9 @@ var Tooltip = function ($) { 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 (_this23._hoverState !== HoverState.ACTIVE && tip.parentNode) { tip.parentNode.removeChild(tip); @@ -2972,6 +3009,7 @@ var Tooltip = function ($) { _this23.element.removeAttribute('aria-describedby'); $(_this23.element).trigger(_this23.constructor.Event.HIDDEN); + _this23._isTransitioning = false; _this23.cleanupTether(); if (callback) { @@ -2988,7 +3026,7 @@ var Tooltip = function ($) { $(tip).removeClass(ClassName.ACTIVE); if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { - + this._isTransitioning = true; $(tip).one(Util.TRANSITION_END, complete).emulateTransitionEnd(TRANSITION_DURATION); } else { complete(); @@ -3075,6 +3113,10 @@ var Tooltip = function ($) { return _this24._leave(event); }); } + + $(_this24.element).closest('.modal').on('hide.bs.modal', function () { + return _this24.hide(); + }); }); if (this.config.selector) { -- cgit v1.2.3 From cd76a6775de677210c25608f4d359ce429df995b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 7 Dec 2016 20:46:17 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 6a384fcc9..0e934e04f 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -563,7 +563,9 @@ var Carousel = function ($) { var Direction = { NEXT: 'next', - PREVIOUS: 'prev' + PREV: 'prev', + LEFT: 'left', + RIGHT: 'right' }; var Event = { @@ -580,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' }; @@ -589,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"]' @@ -782,10 +786,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); @@ -813,14 +817,26 @@ var Carousel = function ($) { 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; } @@ -840,12 +856,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); @@ -853,9 +869,9 @@ var Carousel = function ($) { $(nextElement).addClass(directionalClassName); $(activeElement).one(Util.TRANSITION_END, function () { - $(nextElement).removeClass(directionalClassName + ' ' + direction).addClass(ClassName.ACTIVE); + $(nextElement).removeClass(directionalClassName + ' ' + orderClassName).addClass(ClassName.ACTIVE); - $(activeElement).removeClass(ClassName.ACTIVE + ' ' + direction + ' ' + directionalClassName); + $(activeElement).removeClass(ClassName.ACTIVE + ' ' + orderClassName + ' ' + directionalClassName); _this5._isSliding = false; -- cgit v1.2.3 From ab38529dcc533831341746243ef9f46ddff2171f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 19 Dec 2016 21:48:24 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 74 +++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 0e934e04f..46179bea5 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -214,7 +214,7 @@ var Alert = function ($) { var ClassName = { ALERT: 'alert', FADE: 'fade', - ACTIVE: 'active' + SHOW: 'show' }; /** @@ -279,7 +279,7 @@ var Alert = function ($) { Alert.prototype._removeElement = function _removeElement(element) { var _this2 = this; - $(element).removeClass(ClassName.ACTIVE); + $(element).removeClass(ClassName.SHOW); if (!Util.supportsTransitionEnd() || !$(element).hasClass(ClassName.FADE)) { this._destroyElement(element); @@ -1041,7 +1041,7 @@ var Collapse = function ($) { }; var ClassName = { - ACTIVE: 'active', + SHOW: 'show', COLLAPSE: 'collapse', COLLAPSING: 'collapsing', COLLAPSED: 'collapsed' @@ -1053,7 +1053,7 @@ var Collapse = function ($) { }; var Selector = { - ACTIVES: '.card > .active, .card > .collapsing', + ACTIVES: '.card > .show, .card > .collapsing', DATA_TOGGLE: '[data-toggle="collapse"]' }; @@ -1088,7 +1088,7 @@ var Collapse = function ($) { // public Collapse.prototype.toggle = function toggle() { - if ($(this._element).hasClass(ClassName.ACTIVE)) { + if ($(this._element).hasClass(ClassName.SHOW)) { this.hide(); } else { this.show(); @@ -1102,7 +1102,7 @@ var Collapse = function ($) { throw new Error('Collapse is transitioning'); } - if ($(this._element).hasClass(ClassName.ACTIVE)) { + if ($(this._element).hasClass(ClassName.SHOW)) { return; } @@ -1150,7 +1150,7 @@ var Collapse = function ($) { this.setTransitioning(true); var complete = function complete() { - $(_this6._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).addClass(ClassName.ACTIVE); + $(_this6._element).removeClass(ClassName.COLLAPSING).addClass(ClassName.COLLAPSE).addClass(ClassName.SHOW); _this6._element.style[dimension] = ''; @@ -1179,7 +1179,7 @@ var Collapse = function ($) { throw new Error('Collapse is transitioning'); } - if (!$(this._element).hasClass(ClassName.ACTIVE)) { + if (!$(this._element).hasClass(ClassName.SHOW)) { return; } @@ -1196,7 +1196,7 @@ var Collapse = function ($) { Util.reflow(this._element); - $(this._element).addClass(ClassName.COLLAPSING).removeClass(ClassName.COLLAPSE).removeClass(ClassName.ACTIVE); + $(this._element).addClass(ClassName.COLLAPSING).removeClass(ClassName.COLLAPSE).removeClass(ClassName.SHOW); this._element.setAttribute('aria-expanded', false); @@ -1264,7 +1264,7 @@ var Collapse = function ($) { Collapse.prototype._addAriaAndCollapsedClass = function _addAriaAndCollapsedClass(element, triggerArray) { if (element) { - var isOpen = $(element).hasClass(ClassName.ACTIVE); + var isOpen = $(element).hasClass(ClassName.SHOW); element.setAttribute('aria-expanded', isOpen); if (triggerArray.length) { @@ -1390,7 +1390,7 @@ var Dropdown = function ($) { var ClassName = { BACKDROP: 'dropdown-backdrop', DISABLED: 'disabled', - ACTIVE: 'active' + SHOW: 'show' }; var Selector = { @@ -1428,7 +1428,7 @@ var Dropdown = function ($) { } var parent = Dropdown._getParentFromElement(this); - var isActive = $(parent).hasClass(ClassName.ACTIVE); + var isActive = $(parent).hasClass(ClassName.SHOW); Dropdown._clearMenus(); @@ -1459,7 +1459,7 @@ var Dropdown = function ($) { this.focus(); this.setAttribute('aria-expanded', true); - $(parent).toggleClass(ClassName.ACTIVE); + $(parent).toggleClass(ClassName.SHOW); $(parent).trigger($.Event(Event.SHOWN, relatedTarget)); return false; @@ -1515,7 +1515,7 @@ var Dropdown = function ($) { relatedTarget: toggles[i] }; - if (!$(parent).hasClass(ClassName.ACTIVE)) { + if (!$(parent).hasClass(ClassName.SHOW)) { continue; } @@ -1531,7 +1531,7 @@ var Dropdown = function ($) { toggles[i].setAttribute('aria-expanded', 'false'); - $(parent).removeClass(ClassName.ACTIVE).trigger($.Event(Event.HIDDEN, relatedTarget)); + $(parent).removeClass(ClassName.SHOW).trigger($.Event(Event.HIDDEN, relatedTarget)); } }; @@ -1559,7 +1559,7 @@ var Dropdown = function ($) { } var parent = Dropdown._getParentFromElement(this); - var isActive = $(parent).hasClass(ClassName.ACTIVE); + var isActive = $(parent).hasClass(ClassName.SHOW); if (!isActive && event.which !== ESCAPE_KEYCODE || isActive && event.which === ESCAPE_KEYCODE) { @@ -1691,7 +1691,7 @@ var Modal = function ($) { BACKDROP: 'modal-backdrop', OPEN: 'modal-open', FADE: 'fade', - ACTIVE: 'active' + SHOW: 'show' }; var Selector = { @@ -1808,7 +1808,7 @@ var Modal = function ($) { $(document).off(Event.FOCUSIN); - $(this._element).removeClass(ClassName.ACTIVE); + $(this._element).removeClass(ClassName.SHOW); $(this._element).off(Event.CLICK_DISMISS); $(this._dialog).off(Event.MOUSEDOWN_DISMISS); @@ -1864,7 +1864,7 @@ var Modal = function ($) { Util.reflow(this._element); } - $(this._element).addClass(ClassName.ACTIVE); + $(this._element).addClass(ClassName.SHOW); if (this._config.focus) { this._enforceFocus(); @@ -1983,7 +1983,7 @@ var Modal = function ($) { Util.reflow(this._backdrop); } - $(this._backdrop).addClass(ClassName.ACTIVE); + $(this._backdrop).addClass(ClassName.SHOW); if (!callback) { return; @@ -1996,7 +1996,7 @@ var Modal = function ($) { $(this._backdrop).one(Util.TRANSITION_END, callback).emulateTransitionEnd(BACKDROP_TRANSITION_DURATION); } else if (!this._isShown && this._backdrop) { - $(this._backdrop).removeClass(ClassName.ACTIVE); + $(this._backdrop).removeClass(ClassName.SHOW); var callbackRemove = function callbackRemove() { _this16._removeBackdrop(); @@ -2509,7 +2509,7 @@ var Tab = function ($) { DROPDOWN_MENU: 'dropdown-menu', ACTIVE: 'active', FADE: 'fade', - IN: 'in' + SHOW: 'show' }; var Selector = { @@ -2627,7 +2627,7 @@ var Tab = function ($) { } if (active) { - $(active).removeClass(ClassName.IN); + $(active).removeClass(ClassName.SHOW); } }; @@ -2649,7 +2649,7 @@ var Tab = function ($) { if (isTransitioning) { Util.reflow(element); - $(element).addClass(ClassName.IN); + $(element).addClass(ClassName.SHOW); } else { $(element).removeClass(ClassName.FADE); } @@ -2796,7 +2796,7 @@ var Tooltip = function ($) { }; var HoverState = { - ACTIVE: 'active', + SHOW: 'show', OUT: 'out' }; @@ -2815,7 +2815,7 @@ var Tooltip = function ($) { var ClassName = { FADE: 'fade', - ACTIVE: 'active' + SHOW: 'show' }; var Selector = { @@ -2896,7 +2896,7 @@ var Tooltip = function ($) { } } else { - if ($(this.getTipElement()).hasClass(ClassName.ACTIVE)) { + if ($(this.getTipElement()).hasClass(ClassName.SHOW)) { this._leave(null, this); return; } @@ -2986,7 +2986,7 @@ var Tooltip = function ($) { Util.reflow(tip); this._tether.position(); - $(tip).addClass(ClassName.ACTIVE); + $(tip).addClass(ClassName.SHOW); var complete = function complete() { var prevHoverState = _this22._hoverState; @@ -3019,7 +3019,7 @@ var Tooltip = function ($) { throw new Error('Tooltip is transitioning'); } var complete = function complete() { - if (_this23._hoverState !== HoverState.ACTIVE && tip.parentNode) { + if (_this23._hoverState !== HoverState.SHOW && tip.parentNode) { tip.parentNode.removeChild(tip); } @@ -3039,7 +3039,7 @@ var Tooltip = function ($) { return; } - $(tip).removeClass(ClassName.ACTIVE); + $(tip).removeClass(ClassName.SHOW); if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { this._isTransitioning = true; @@ -3066,7 +3066,7 @@ var Tooltip = function ($) { this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle()); - $tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE); + $tip.removeClass(ClassName.FADE + ' ' + ClassName.SHOW); this.cleanupTether(); }; @@ -3167,14 +3167,14 @@ var Tooltip = function ($) { context._activeTrigger[event.type === 'focusin' ? Trigger.FOCUS : Trigger.HOVER] = true; } - if ($(context.getTipElement()).hasClass(ClassName.ACTIVE) || context._hoverState === HoverState.ACTIVE) { - context._hoverState = HoverState.ACTIVE; + if ($(context.getTipElement()).hasClass(ClassName.SHOW) || context._hoverState === HoverState.SHOW) { + context._hoverState = HoverState.SHOW; return; } clearTimeout(context._timeout); - context._hoverState = HoverState.ACTIVE; + context._hoverState = HoverState.SHOW; if (!context.config.delay || !context.config.delay.show) { context.show(); @@ -3182,7 +3182,7 @@ var Tooltip = function ($) { } context._timeout = setTimeout(function () { - if (context._hoverState === HoverState.ACTIVE) { + if (context._hoverState === HoverState.SHOW) { context.show(); } }, context.config.delay.show); @@ -3376,7 +3376,7 @@ var Popover = function ($) { var ClassName = { FADE: 'fade', - ACTIVE: 'active' + SHOW: 'show' }; var Selector = { @@ -3429,7 +3429,7 @@ var Popover = function ($) { this.setElementContent($tip.find(Selector.TITLE), this.getTitle()); this.setElementContent($tip.find(Selector.CONTENT), this._getContent()); - $tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE); + $tip.removeClass(ClassName.FADE + ' ' + ClassName.SHOW); this.cleanupTether(); }; -- cgit v1.2.3 From a86f8f7bcfb59a5e026dd6a22278d3d945ff2e4e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2016 20:37:46 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 46179bea5..dbf9064e8 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -2742,7 +2742,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/)'); } -- cgit v1.2.3 From cd18ee8af693755798eb9d20dfc82a350996c04b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 24 Dec 2016 14:29:41 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index dbf9064e8..b77bb41ad 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -750,13 +750,14 @@ var Carousel = function ($) { if (/input|textarea/i.test(event.target.tagName)) { return; } - event.preventDefault(); switch (event.which) { case ARROW_LEFT_KEYCODE: + event.preventDefault(); this.prev(); break; case ARROW_RIGHT_KEYCODE: + event.preventDefault(); this.next(); break; default: @@ -2395,7 +2396,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, { -- cgit v1.2.3 From 7a91b65d471cc6db9983cbed7bafe8947f2329f3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 27 Dec 2016 14:13:56 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index b77bb41ad..b19fca4ed 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -2509,6 +2509,7 @@ var Tab = function ($) { var ClassName = { DROPDOWN_MENU: 'dropdown-menu', ACTIVE: 'active', + DISABLED: 'disabled', FADE: 'fade', SHOW: 'show' }; @@ -2546,7 +2547,7 @@ var Tab = function ($) { Tab.prototype.show = function show() { 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; } -- cgit v1.2.3 From e1e621be046a4541a2fd36e445015ee44de3c67e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Dec 2016 15:15:29 -0800 Subject: grunt --- docs/dist/js/bootstrap.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/dist/js/bootstrap.js') diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index b19fca4ed..b9e5f56f9 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -3043,6 +3043,10 @@ var Tooltip = function ($) { $(tip).removeClass(ClassName.SHOW); + 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); -- cgit v1.2.3