diff options
| author | Mark Otto <[email protected]> | 2014-09-08 10:23:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-09-08 10:23:25 -0700 |
| commit | 48a1308e5dcf3fac575b74174ef07731203e335e (patch) | |
| tree | 9b2f3f4b436414455cc2362362d28f56bacc84c8 /docs/dist/js/bootstrap.js | |
| parent | 7f56233862a9706cec0131e272d7bf7c0ca9f90c (diff) | |
| download | bootstrap-48a1308e5dcf3fac575b74174ef07731203e335e.tar.xz bootstrap-48a1308e5dcf3fac575b74174ef07731203e335e.zip | |
grunt
Diffstat (limited to 'docs/dist/js/bootstrap.js')
| -rw-r--r-- | docs/dist/js/bootstrap.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 717980203..656ba9e40 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -1050,8 +1050,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re } Modal.prototype.checkScrollbar = function () { - if (document.body.clientWidth >= window.innerWidth) return - this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar() + this.scrollbarWidth = this.measureScrollbar() } Modal.prototype.setScrollbar = function () { @@ -1064,6 +1063,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re } Modal.prototype.measureScrollbar = function () { // thx walsh + if (document.body.clientWidth >= window.innerWidth) return 0 var scrollDiv = document.createElement('div') scrollDiv.className = 'modal-scrollbar-measure' this.$body.append(scrollDiv) |