mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

Release v4.6.1 (#35272)

Browse Source 
* Bump version to v4.6.1

* Dist
This commit is contained in:
XhmikosR
2021-10-28 17:45:21 +03:00
committed by GitHub
parent ef6a418535
commit 043a03c95a
67 changed files with 2372 additions and 2578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/dist/modal.js
Vendored
+114 -122
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap modal.js v4.6.0 (https://getbootstrap.com/)
* Bootstrap modal.js v4.6.1 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
@@ -7,7 +7,7 @@
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('jquery'), require('./util.js')) :
typeof define === 'function' && define.amd ? define(['jquery', './util'], factory) :
(global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Modal = factory(global.jQuery, global.Util));
}(this, (function ($, Util) { 'use strict';
})(this, (function ($, Util) { 'use strict';
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -49,31 +49,24 @@
}
/**
* ------------------------------------------------------------------------
* Constants
* ------------------------------------------------------------------------
*/
var NAME = 'modal';
var VERSION = '4.6.0';
var VERSION = '4.6.1';
var DATA_KEY = 'bs.modal';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
var JQUERY_NO_CONFLICT = $__default['default'].fn[NAME];
var JQUERY_NO_CONFLICT = $__default["default"].fn[NAME];
var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key
var Default = {
backdrop: true,
keyboard: true,
focus: true,
show: true
};
var DefaultType = {
backdrop: '(boolean|string)',
keyboard: 'boolean',
focus: 'boolean',
show: 'boolean'
};
var CLASS_NAME_SCROLLABLE = 'modal-dialog-scrollable';
var CLASS_NAME_SCROLLBAR_MEASURER = 'modal-scrollbar-measure';
var CLASS_NAME_BACKDROP = 'modal-backdrop';
var CLASS_NAME_OPEN = 'modal-open';
var CLASS_NAME_FADE = 'fade';
var CLASS_NAME_SHOW = 'show';
var CLASS_NAME_STATIC = 'modal-static';
var EVENT_HIDE = "hide" + EVENT_KEY;
var EVENT_HIDE_PREVENTED = "hidePrevented" + EVENT_KEY;
var EVENT_HIDDEN = "hidden" + EVENT_KEY;
@@ -86,23 +79,26 @@
var EVENT_MOUSEUP_DISMISS = "mouseup.dismiss" + EVENT_KEY;
var EVENT_MOUSEDOWN_DISMISS = "mousedown.dismiss" + EVENT_KEY;
var EVENT_CLICK_DATA_API = "click" + EVENT_KEY + DATA_API_KEY;
var CLASS_NAME_SCROLLABLE = 'modal-dialog-scrollable';
var CLASS_NAME_SCROLLBAR_MEASURER = 'modal-scrollbar-measure';
var CLASS_NAME_BACKDROP = 'modal-backdrop';
var CLASS_NAME_OPEN = 'modal-open';
var CLASS_NAME_FADE = 'fade';
var CLASS_NAME_SHOW = 'show';
var CLASS_NAME_STATIC = 'modal-static';
var SELECTOR_DIALOG = '.modal-dialog';
var SELECTOR_MODAL_BODY = '.modal-body';
var SELECTOR_DATA_TOGGLE = '[data-toggle="modal"]';
var SELECTOR_DATA_DISMISS = '[data-dismiss="modal"]';
var SELECTOR_FIXED_CONTENT = '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top';
var SELECTOR_STICKY_CONTENT = '.sticky-top';
var Default = {
backdrop: true,
keyboard: true,
focus: true,
show: true
};
var DefaultType = {
backdrop: '(boolean|string)',
keyboard: 'boolean',
focus: 'boolean',
show: 'boolean'
};
/**
* ------------------------------------------------------------------------
* Class Definition
* ------------------------------------------------------------------------
* Class definition
*/
var Modal = /*#__PURE__*/function () {
@@ -133,21 +129,21 @@
return;
}
if ($__default['default'](this._element).hasClass(CLASS_NAME_FADE)) {
this._isTransitioning = true;
}
var showEvent = $__default['default'].Event(EVENT_SHOW, {
var showEvent = $__default["default"].Event(EVENT_SHOW, {
relatedTarget: relatedTarget
});
$__default['default'](this._element).trigger(showEvent);
$__default["default"](this._element).trigger(showEvent);
if (this._isShown || showEvent.isDefaultPrevented()) {
if (showEvent.isDefaultPrevented()) {
return;
}
this._isShown = true;
if ($__default["default"](this._element).hasClass(CLASS_NAME_FADE)) {
this._isTransitioning = true;
}
this._checkScrollbar();
this._setScrollbar();
@@ -158,12 +154,12 @@
this._setResizeEvent();
$__default['default'](this._element).on(EVENT_CLICK_DISMISS, SELECTOR_DATA_DISMISS, function (event) {
$__default["default"](this._element).on(EVENT_CLICK_DISMISS, SELECTOR_DATA_DISMISS, function (event) {
return _this.hide(event);
});
$__default['default'](this._dialog).on(EVENT_MOUSEDOWN_DISMISS, function () {
$__default['default'](_this._element).one(EVENT_MOUSEUP_DISMISS, function (event) {
if ($__default['default'](event.target).is(_this._element)) {
$__default["default"](this._dialog).on(EVENT_MOUSEDOWN_DISMISS, function () {
$__default["default"](_this._element).one(EVENT_MOUSEUP_DISMISS, function (event) {
if ($__default["default"](event.target).is(_this._element)) {
_this._ignoreBackdropClick = true;
}
});
@@ -185,15 +181,15 @@
return;
}
var hideEvent = $__default['default'].Event(EVENT_HIDE);
$__default['default'](this._element).trigger(hideEvent);
var hideEvent = $__default["default"].Event(EVENT_HIDE);
$__default["default"](this._element).trigger(hideEvent);
if (!this._isShown || hideEvent.isDefaultPrevented()) {
return;
}
this._isShown = false;
var transition = $__default['default'](this._element).hasClass(CLASS_NAME_FADE);
var transition = $__default["default"](this._element).hasClass(CLASS_NAME_FADE);
if (transition) {
this._isTransitioning = true;
@@ -203,14 +199,14 @@
this._setResizeEvent();
$__default['default'](document).off(EVENT_FOCUSIN);
$__default['default'](this._element).removeClass(CLASS_NAME_SHOW);
$__default['default'](this._element).off(EVENT_CLICK_DISMISS);
$__default['default'](this._dialog).off(EVENT_MOUSEDOWN_DISMISS);
$__default["default"](document).off(EVENT_FOCUSIN);
$__default["default"](this._element).removeClass(CLASS_NAME_SHOW);
$__default["default"](this._element).off(EVENT_CLICK_DISMISS);
$__default["default"](this._dialog).off(EVENT_MOUSEDOWN_DISMISS);
if (transition) {
var transitionDuration = Util__default['default'].getTransitionDurationFromElement(this._element);
$__default['default'](this._element).one(Util__default['default'].TRANSITION_END, function (event) {
var transitionDuration = Util__default["default"].getTransitionDurationFromElement(this._element);
$__default["default"](this._element).one(Util__default["default"].TRANSITION_END, function (event) {
return _this2._hideModal(event);
}).emulateTransitionEnd(transitionDuration);
} else {
@@ -220,7 +216,7 @@
_proto.dispose = function dispose() {
[window, this._element, this._dialog].forEach(function (htmlElement) {
return $__default['default'](htmlElement).off(EVENT_KEY);
return $__default["default"](htmlElement).off(EVENT_KEY);
});
/**
* `document` has 2 events `EVENT_FOCUSIN` and `EVENT_CLICK_DATA_API`
@@ -228,8 +224,8 @@
* It will remove `EVENT_CLICK_DATA_API` event that should remain
*/
$__default['default'](document).off(EVENT_FOCUSIN);
$__default['default'].removeData(this._element, DATA_KEY);
$__default["default"](document).off(EVENT_FOCUSIN);
$__default["default"].removeData(this._element, DATA_KEY);
this._config = null;
this._element = null;
this._dialog = null;
@@ -248,15 +244,15 @@
_proto._getConfig = function _getConfig(config) {
config = _extends({}, Default, config);
Util__default['default'].typeCheckConfig(NAME, config, DefaultType);
Util__default["default"].typeCheckConfig(NAME, config, DefaultType);
return config;
};
_proto._triggerBackdropTransition = function _triggerBackdropTransition() {
var _this3 = this;
var hideEventPrevented = $__default['default'].Event(EVENT_HIDE_PREVENTED);
$__default['default'](this._element).trigger(hideEventPrevented);
var hideEventPrevented = $__default["default"].Event(EVENT_HIDE_PREVENTED);
$__default["default"](this._element).trigger(hideEventPrevented);
if (hideEventPrevented.isDefaultPrevented()) {
return;
@@ -270,13 +266,13 @@
this._element.classList.add(CLASS_NAME_STATIC);
var modalTransitionDuration = Util__default['default'].getTransitionDurationFromElement(this._dialog);
$__default['default'](this._element).off(Util__default['default'].TRANSITION_END);
$__default['default'](this._element).one(Util__default['default'].TRANSITION_END, function () {
var modalTransitionDuration = Util__default["default"].getTransitionDurationFromElement(this._dialog);
$__default["default"](this._element).off(Util__default["default"].TRANSITION_END);
$__default["default"](this._element).one(Util__default["default"].TRANSITION_END, function () {
_this3._element.classList.remove(CLASS_NAME_STATIC);
if (!isModalOverflowing) {
$__default['default'](_this3._element).one(Util__default['default'].TRANSITION_END, function () {
$__default["default"](_this3._element).one(Util__default["default"].TRANSITION_END, function () {
_this3._element.style.overflowY = '';
}).emulateTransitionEnd(_this3._element, modalTransitionDuration);
}
@@ -288,7 +284,7 @@
_proto._showElement = function _showElement(relatedTarget) {
var _this4 = this;
var transition = $__default['default'](this._element).hasClass(CLASS_NAME_FADE);
var transition = $__default["default"](this._element).hasClass(CLASS_NAME_FADE);
var modalBody = this._dialog ? this._dialog.querySelector(SELECTOR_MODAL_BODY) : null;
if (!this._element.parentNode || this._element.parentNode.nodeType !== Node.ELEMENT_NODE) {
@@ -304,23 +300,23 @@
this._element.setAttribute('role', 'dialog');
if ($__default['default'](this._dialog).hasClass(CLASS_NAME_SCROLLABLE) && modalBody) {
if ($__default["default"](this._dialog).hasClass(CLASS_NAME_SCROLLABLE) && modalBody) {
modalBody.scrollTop = 0;
} else {
this._element.scrollTop = 0;
}
if (transition) {
Util__default['default'].reflow(this._element);
Util__default["default"].reflow(this._element);
}
$__default['default'](this._element).addClass(CLASS_NAME_SHOW);
$__default["default"](this._element).addClass(CLASS_NAME_SHOW);
if (this._config.focus) {
this._enforceFocus();
}
var shownEvent = $__default['default'].Event(EVENT_SHOWN, {
var shownEvent = $__default["default"].Event(EVENT_SHOWN, {
relatedTarget: relatedTarget
});
@@ -330,12 +326,12 @@
}
_this4._isTransitioning = false;
$__default['default'](_this4._element).trigger(shownEvent);
$__default["default"](_this4._element).trigger(shownEvent);
};
if (transition) {
var transitionDuration = Util__default['default'].getTransitionDurationFromElement(this._dialog);
$__default['default'](this._dialog).one(Util__default['default'].TRANSITION_END, transitionComplete).emulateTransitionEnd(transitionDuration);
var transitionDuration = Util__default["default"].getTransitionDurationFromElement(this._dialog);
$__default["default"](this._dialog).one(Util__default["default"].TRANSITION_END, transitionComplete).emulateTransitionEnd(transitionDuration);
} else {
transitionComplete();
}
@@ -344,9 +340,9 @@
_proto._enforceFocus = function _enforceFocus() {
var _this5 = this;
$__default['default'](document).off(EVENT_FOCUSIN) // Guard against infinite focus loop
$__default["default"](document).off(EVENT_FOCUSIN) // Guard against infinite focus loop
.on(EVENT_FOCUSIN, function (event) {
if (document !== event.target && _this5._element !== event.target && $__default['default'](_this5._element).has(event.target).length === 0) {
if (document !== event.target && _this5._element !== event.target && $__default["default"](_this5._element).has(event.target).length === 0) {
_this5._element.focus();
}
});
@@ -356,7 +352,7 @@
var _this6 = this;
if (this._isShown) {
$__default['default'](this._element).on(EVENT_KEYDOWN_DISMISS, function (event) {
$__default["default"](this._element).on(EVENT_KEYDOWN_DISMISS, function (event) {
if (_this6._config.keyboard && event.which === ESCAPE_KEYCODE) {
event.preventDefault();
@@ -366,7 +362,7 @@
}
});
} else if (!this._isShown) {
$__default['default'](this._element).off(EVENT_KEYDOWN_DISMISS);
$__default["default"](this._element).off(EVENT_KEYDOWN_DISMISS);
}
};
@@ -374,11 +370,11 @@
var _this7 = this;
if (this._isShown) {
$__default['default'](window).on(EVENT_RESIZE, function (event) {
$__default["default"](window).on(EVENT_RESIZE, function (event) {
return _this7.handleUpdate(event);
});
} else {
$__default['default'](window).off(EVENT_RESIZE);
$__default["default"](window).off(EVENT_RESIZE);
}
};
@@ -396,19 +392,19 @@
this._isTransitioning = false;
this._showBackdrop(function () {
$__default['default'](document.body).removeClass(CLASS_NAME_OPEN);
$__default["default"](document.body).removeClass(CLASS_NAME_OPEN);
_this8._resetAdjustments();
_this8._resetScrollbar();
$__default['default'](_this8._element).trigger(EVENT_HIDDEN);
$__default["default"](_this8._element).trigger(EVENT_HIDDEN);
});
};
_proto._removeBackdrop = function _removeBackdrop() {
if (this._backdrop) {
$__default['default'](this._backdrop).remove();
$__default["default"](this._backdrop).remove();
this._backdrop = null;
}
};
@@ -416,7 +412,7 @@
_proto._showBackdrop = function _showBackdrop(callback) {
var _this9 = this;
var animate = $__default['default'](this._element).hasClass(CLASS_NAME_FADE) ? CLASS_NAME_FADE : '';
var animate = $__default["default"](this._element).hasClass(CLASS_NAME_FADE) ? CLASS_NAME_FADE : '';
if (this._isShown && this._config.backdrop) {
this._backdrop = document.createElement('div');
@@ -426,8 +422,8 @@
this._backdrop.classList.add(animate);
}
$__default['default'](this._backdrop).appendTo(document.body);
$__default['default'](this._element).on(EVENT_CLICK_DISMISS, function (event) {
$__default["default"](this._backdrop).appendTo(document.body);
$__default["default"](this._element).on(EVENT_CLICK_DISMISS, function (event) {
if (_this9._ignoreBackdropClick) {
_this9._ignoreBackdropClick = false;
return;
@@ -445,10 +441,10 @@
});
if (animate) {
Util__default['default'].reflow(this._backdrop);
Util__default["default"].reflow(this._backdrop);
}
$__default['default'](this._backdrop).addClass(CLASS_NAME_SHOW);
$__default["default"](this._backdrop).addClass(CLASS_NAME_SHOW);
if (!callback) {
return;
@@ -459,10 +455,10 @@
return;
}
var backdropTransitionDuration = Util__default['default'].getTransitionDurationFromElement(this._backdrop);
$__default['default'](this._backdrop).one(Util__default['default'].TRANSITION_END, callback).emulateTransitionEnd(backdropTransitionDuration);
var backdropTransitionDuration = Util__default["default"].getTransitionDurationFromElement(this._backdrop);
$__default["default"](this._backdrop).one(Util__default["default"].TRANSITION_END, callback).emulateTransitionEnd(backdropTransitionDuration);
} else if (!this._isShown && this._backdrop) {
$__default['default'](this._backdrop).removeClass(CLASS_NAME_SHOW);
$__default["default"](this._backdrop).removeClass(CLASS_NAME_SHOW);
var callbackRemove = function callbackRemove() {
_this9._removeBackdrop();
@@ -472,10 +468,10 @@
}
};
if ($__default['default'](this._element).hasClass(CLASS_NAME_FADE)) {
var _backdropTransitionDuration = Util__default['default'].getTransitionDurationFromElement(this._backdrop);
if ($__default["default"](this._element).hasClass(CLASS_NAME_FADE)) {
var _backdropTransitionDuration = Util__default["default"].getTransitionDurationFromElement(this._backdrop);
$__default['default'](this._backdrop).one(Util__default['default'].TRANSITION_END, callbackRemove).emulateTransitionEnd(_backdropTransitionDuration);
$__default["default"](this._backdrop).one(Util__default["default"].TRANSITION_END, callbackRemove).emulateTransitionEnd(_backdropTransitionDuration);
} else {
callbackRemove();
}
@@ -520,46 +516,46 @@
var fixedContent = [].slice.call(document.querySelectorAll(SELECTOR_FIXED_CONTENT));
var stickyContent = [].slice.call(document.querySelectorAll(SELECTOR_STICKY_CONTENT)); // Adjust fixed content padding
$__default['default'](fixedContent).each(function (index, element) {
$__default["default"](fixedContent).each(function (index, element) {
var actualPadding = element.style.paddingRight;
var calculatedPadding = $__default['default'](element).css('padding-right');
$__default['default'](element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this10._scrollbarWidth + "px");
var calculatedPadding = $__default["default"](element).css('padding-right');
$__default["default"](element).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + _this10._scrollbarWidth + "px");
}); // Adjust sticky content margin
$__default['default'](stickyContent).each(function (index, element) {
$__default["default"](stickyContent).each(function (index, element) {
var actualMargin = element.style.marginRight;
var calculatedMargin = $__default['default'](element).css('margin-right');
$__default['default'](element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) - _this10._scrollbarWidth + "px");
var calculatedMargin = $__default["default"](element).css('margin-right');
$__default["default"](element).data('margin-right', actualMargin).css('margin-right', parseFloat(calculatedMargin) - _this10._scrollbarWidth + "px");
}); // Adjust body padding
var actualPadding = document.body.style.paddingRight;
var calculatedPadding = $__default['default'](document.body).css('padding-right');
$__default['default'](document.body).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + "px");
var calculatedPadding = $__default["default"](document.body).css('padding-right');
$__default["default"](document.body).data('padding-right', actualPadding).css('padding-right', parseFloat(calculatedPadding) + this._scrollbarWidth + "px");
}
$__default['default'](document.body).addClass(CLASS_NAME_OPEN);
$__default["default"](document.body).addClass(CLASS_NAME_OPEN);
};
_proto._resetScrollbar = function _resetScrollbar() {
// Restore fixed content padding
var fixedContent = [].slice.call(document.querySelectorAll(SELECTOR_FIXED_CONTENT));
$__default['default'](fixedContent).each(function (index, element) {
var padding = $__default['default'](element).data('padding-right');
$__default['default'](element).removeData('padding-right');
$__default["default"](fixedContent).each(function (index, element) {
var padding = $__default["default"](element).data('padding-right');
$__default["default"](element).removeData('padding-right');
element.style.paddingRight = padding ? padding : '';
}); // Restore sticky content
var elements = [].slice.call(document.querySelectorAll("" + SELECTOR_STICKY_CONTENT));
$__default['default'](elements).each(function (index, element) {
var margin = $__default['default'](element).data('margin-right');
$__default["default"](elements).each(function (index, element) {
var margin = $__default["default"](element).data('margin-right');
if (typeof margin !== 'undefined') {
$__default['default'](element).css('margin-right', margin).removeData('margin-right');
$__default["default"](element).css('margin-right', margin).removeData('margin-right');
}
}); // Restore body padding
var padding = $__default['default'](document.body).data('padding-right');
$__default['default'](document.body).removeData('padding-right');
var padding = $__default["default"](document.body).data('padding-right');
$__default["default"](document.body).removeData('padding-right');
document.body.style.paddingRight = padding ? padding : '';
};
@@ -576,13 +572,13 @@
Modal._jQueryInterface = function _jQueryInterface(config, relatedTarget) {
return this.each(function () {
var data = $__default['default'](this).data(DATA_KEY);
var data = $__default["default"](this).data(DATA_KEY);
var _config = _extends({}, Default, $__default['default'](this).data(), typeof config === 'object' && config ? config : {});
var _config = _extends({}, Default, $__default["default"](this).data(), typeof config === 'object' && config ? config : {});
if (!data) {
data = new Modal(this, _config);
$__default['default'](this).data(DATA_KEY, data);
$__default["default"](this).data(DATA_KEY, data);
}
if (typeof config === 'string') {
@@ -612,58 +608,54 @@
return Modal;
}();
/**
* ------------------------------------------------------------------------
* Data Api implementation
* ------------------------------------------------------------------------
* Data API implementation
*/
$__default['default'](document).on(EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {
$__default["default"](document).on(EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {
var _this11 = this;
var target;
var selector = Util__default['default'].getSelectorFromElement(this);
var selector = Util__default["default"].getSelectorFromElement(this);
if (selector) {
target = document.querySelector(selector);
}
var config = $__default['default'](target).data(DATA_KEY) ? 'toggle' : _extends({}, $__default['default'](target).data(), $__default['default'](this).data());
var config = $__default["default"](target).data(DATA_KEY) ? 'toggle' : _extends({}, $__default["default"](target).data(), $__default["default"](this).data());
if (this.tagName === 'A' || this.tagName === 'AREA') {
event.preventDefault();
}
var $target = $__default['default'](target).one(EVENT_SHOW, function (showEvent) {
var $target = $__default["default"](target).one(EVENT_SHOW, function (showEvent) {
if (showEvent.isDefaultPrevented()) {
// Only register focus restorer if modal will actually get shown
return;
}
$target.one(EVENT_HIDDEN, function () {
if ($__default['default'](_this11).is(':visible')) {
if ($__default["default"](_this11).is(':visible')) {
_this11.focus();
}
});
});
Modal._jQueryInterface.call($__default['default'](target), config, this);
Modal._jQueryInterface.call($__default["default"](target), config, this);
});
/**
* ------------------------------------------------------------------------
* jQuery
* ------------------------------------------------------------------------
*/
$__default['default'].fn[NAME] = Modal._jQueryInterface;
$__default['default'].fn[NAME].Constructor = Modal;
$__default["default"].fn[NAME] = Modal._jQueryInterface;
$__default["default"].fn[NAME].Constructor = Modal;
$__default['default'].fn[NAME].noConflict = function () {
$__default['default'].fn[NAME] = JQUERY_NO_CONFLICT;
$__default["default"].fn[NAME].noConflict = function () {
$__default["default"].fn[NAME] = JQUERY_NO_CONFLICT;
return Modal._jQueryInterface;
};
return Modal;
})));
}));
//# sourceMappingURL=modal.js.map