diff options
Diffstat (limited to 'dist/js/bootstrap.js')
-rw-r--r-- | dist/js/bootstrap.js | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 25340149c7..4b9a425771 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -524,12 +524,13 @@ delegationSelector = null; } - for (var _i = 0, _Object$keys = Object.keys(events); _i < _Object$keys.length; _i++) { - var uid = _Object$keys[_i]; - var event = events[uid]; + var uidEventList = Object.keys(events); + + for (var i = 0, len = uidEventList.length; i < len; i++) { + var event = events[uidEventList[i]]; if (event.originalHandler === handler && event.delegationSelector === delegationSelector) { - return events[uid]; + return event; } } @@ -593,7 +594,7 @@ function removeHandler(element, events, typeEvent, handler, delegationSelector) { var fn = findHandler(events[typeEvent], handler, delegationSelector); - if (fn === null) { + if (!fn) { return; } @@ -2752,7 +2753,7 @@ if (!isActive || isActive && (event.which === ESCAPE_KEYCODE || event.which === SPACE_KEYCODE)) { if (event.which === ESCAPE_KEYCODE) { - EventHandler.trigger(SelectorEngine.findOne(Selector$4.DATA_TOGGLE, parent), 'focus'); + SelectorEngine.findOne(Selector$4.DATA_TOGGLE, parent).focus(); } Dropdown._clearMenus(); @@ -3647,8 +3648,7 @@ SHOW: 'show' }; var Selector$6 = { - TOOLTIP_INNER: '.tooltip-inner', - TOOLTIP_ARROW: '.tooltip-arrow' + TOOLTIP_INNER: '.tooltip-inner' }; var Trigger = { HOVER: 'hover', @@ -3743,7 +3743,7 @@ clearTimeout(this._timeout); Data.removeData(this.element, this.constructor.DATA_KEY); EventHandler.off(this.element, this.constructor.EVENT_KEY); - EventHandler.off(SelectorEngine.closest(this.element, '.modal'), 'hide.bs.modal'); + EventHandler.off(SelectorEngine.closest(this.element, '.modal'), 'hide.bs.modal', this._hideModalHandler); if (this.tip) { this.tip.parentNode.removeChild(this.tip); @@ -3813,7 +3813,7 @@ behavior: this.config.fallbackPlacement }, arrow: { - element: Selector$6.TOOLTIP_ARROW + element: "." + this.constructor.NAME + "-arrow" }, preventOverflow: { boundariesElement: this.config.boundary @@ -4049,11 +4049,14 @@ }); } }); - EventHandler.on(SelectorEngine.closest(this.element, '.modal'), 'hide.bs.modal', function () { + + this._hideModalHandler = function () { if (_this4.element) { _this4.hide(); } - }); + }; + + EventHandler.on(SelectorEngine.closest(this.element, '.modal'), 'hide.bs.modal', this._hideModalHandler); if (this.config.selector) { this.config = _objectSpread({}, this.config, { @@ -5131,7 +5134,11 @@ _proto.show = function show() { var _this = this; - EventHandler.trigger(this._element, Event$b.SHOW); + var showEvent = EventHandler.trigger(this._element, Event$b.SHOW); + + if (showEvent.defaultPrevented) { + return; + } if (this._config.animation) { this._element.classList.add(ClassName$a.FADE); @@ -5171,7 +5178,11 @@ return; } - EventHandler.trigger(this._element, Event$b.HIDE); + var hideEvent = EventHandler.trigger(this._element, Event$b.HIDE); + + if (hideEvent.defaultPrevented) { + return; + } var complete = function complete() { _this2._element.classList.add(ClassName$a.HIDE); |