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

dist

Browse Source
This commit is contained in:
Mark Otto
2017-10-15 15:51:44 -07:00
parent 3ccb7ef16a
commit 7ce2b03b1a
39 changed files with 245 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/dist/modal.js
Vendored
+7 -8
View File
@@ -97,7 +97,7 @@ var Modal = function () {
_proto.show = function show(relatedTarget) {
var _this = this;
if (this._isTransitioning) {
if (this._isTransitioning || this._isShown) {
return;
}
@@ -155,12 +155,6 @@ var Modal = function () {
return;
}
var transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE);
if (transition) {
this._isTransitioning = true;
}
var hideEvent = $.Event(Event.HIDE);
$(this._element).trigger(hideEvent);
@@ -169,6 +163,11 @@ var Modal = function () {
}
this._isShown = false;
var transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE);
if (transition) {
this._isTransitioning = true;
}
this._setEscapeEvent();
@@ -577,5 +576,5 @@ var Modal = function () {
};
return Modal;
}(jQuery);
}($);
//# sourceMappingURL=modal.js.map