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

Merge branch 'v4-dev' into v4-forms-cleanup

Browse Source
This commit is contained in:
Mark Otto
2016-04-23 14:24:08 -07:00
parent 29ff8e8b14 1a6d0cc446
commit 9f2ab98026
27 changed files with 142 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/dist/modal.js
Vendored
+1 -7
View File
@@ -410,13 +410,7 @@ var Modal = (function ($) {
}, {
key: '_checkScrollbar',
value: function _checkScrollbar() {
var fullWindowWidth = window.innerWidth;
if (!fullWindowWidth) {
// workaround for missing window.innerWidth in IE8
var documentElementRect = document.documentElement.getBoundingClientRect();
fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left);
}
this._isBodyOverflowing = document.body.clientWidth < fullWindowWidth;
this._isBodyOverflowing = document.body.clientWidth < window.innerWidth;
this._scrollbarWidth = this._getScrollbarWidth();
}
}, {
js/dist/modal.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
js/src/modal.js
+1 -7
View File
@@ -408,13 +408,7 @@ const Modal = (($) => {
}
_checkScrollbar() {
let fullWindowWidth = window.innerWidth
if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
let documentElementRect = document.documentElement.getBoundingClientRect()
fullWindowWidth =
documentElementRect.right - Math.abs(documentElementRect.left)
}
this._isBodyOverflowing = document.body.clientWidth < fullWindowWidth
this._isBodyOverflowing = document.body.clientWidth < window.innerWidth
this._scrollbarWidth = this._getScrollbarWidth()
}