diff options
| author | Bootstrap's Grunt bot <[email protected]> | 2015-02-24 02:41:30 +0000 |
|---|---|---|
| committer | Bootstrap's Grunt bot <[email protected]> | 2015-02-24 02:41:30 +0000 |
| commit | 1cbbeef47c696fc4f389cd0df900cf6213ed327d (patch) | |
| tree | 1040dfd391e4498b3ec9a1eb2488276bd4e0de5e /dist/js/bootstrap.js | |
| parent | 16479e9051614696df3d21acd9d482018da17045 (diff) | |
| download | bootstrap-1cbbeef47c696fc4f389cd0df900cf6213ed327d.tar.xz bootstrap-1cbbeef47c696fc4f389cd0df900cf6213ed327d.zip | |
automatic grunt dist
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 5430993de..5a11cc20d 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1150,7 +1150,12 @@ if (typeof jQuery === 'undefined') { } Modal.prototype.checkScrollbar = function () { - this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight + 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.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth this.scrollbarWidth = this.measureScrollbar() } |