Skip to content

B
bootstrap
Commit 7f562338 authored by Chris Rebert's avatar Chris Rebert
Browse files
Options

Merge branch 'stefansundin/master'

parents 5b9fcea9 f2518161
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
js/modal.js
View file @ 7f562338
...@@ -207,8 +207,7 @@ ...@@ -207,8 +207,7 @@
} }
Modal.prototype.checkScrollbar = function () { Modal.prototype.checkScrollbar = function () {
if (document.body.clientWidth >= window.innerWidth) return this.scrollbarWidth = this.measureScrollbar()
this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar()
} }
Modal.prototype.setScrollbar = function () { Modal.prototype.setScrollbar = function () {
...@@ -221,6 +220,7 @@ ...@@ -221,6 +220,7 @@
} }
Modal.prototype.measureScrollbar = function () { // thx walsh Modal.prototype.measureScrollbar = function () { // thx walsh
if (document.body.clientWidth >= window.innerWidth) return 0
var scrollDiv = document.createElement('div') var scrollDiv = document.createElement('div')
scrollDiv.className = 'modal-scrollbar-measure' scrollDiv.className = 'modal-scrollbar-measure'
this.$body.append(scrollDiv) this.$body.append(scrollDiv)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment