mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 12:59:05 +02:00
Code Issues Releases Wiki Activity

some minor alert shit

Browse Source
This commit is contained in:
Jacob Thornton
2015-08-18 20:33:57 -07:00
parent 8cfde5ef29
commit fd65b9f32e
24 changed files with 153 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/dist/modal.js vendored
View File

@@ -230,14 +230,18 @@ var Modal = (function ($) {
$(this._element).addClass(ClassName.IN);
if (this._config.focus) this._enforceFocus();
if (this._config.focus) {
this._enforceFocus();
}
var shownEvent = $.Event(Event.SHOWN, {
relatedTarget: relatedTarget
});
var transitionComplete = function transitionComplete() {
if (_this2._config.focus) _this2._element.focus();
if (_this2._config.focus) {
_this2._element.focus();
}
$(_this2._element).trigger(shownEvent);
};
@@ -394,7 +398,7 @@ var Modal = (function ($) {
}
if (this._isBodyOverflowing && !isModalOverflowing) {
this._element.style.paddingRight = this._scrollbarWidth + 'px';
this._element.style.paddingRight = this._scrollbarWidth + 'px~';
}
}
}, {
@@ -423,7 +427,7 @@ var Modal = (function ($) {
this._originalBodyPadding = document.body.style.paddingRight || '';
if (this._isBodyOverflowing) {
document.body.style.paddingRight = bodyPadding + this._scrollbarWidth + 'px';
document.body.style.paddingRight = bodyPadding + (this._scrollbarWidth + 'px');
}
}
}, {