mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-11 16:14:04 +02:00
Code Issues Releases Wiki Activity

Modal body shift fix for IE10/11

Browse Source 
Closes #13103 by merging it.
This commit is contained in:
Tyler Cipriani
2014-03-17 13:04:58 -06:00
committed by Chris Rebert
parent 28e6c34268
commit 0907244256
4 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dist/js/bootstrap.js vendored
View File

@@ -795,11 +795,12 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
// ====================== // ======================
var Modal = function (element, options) { var Modal = function (element, options) {
this.options = options this.options = options
this.$body = $(document.body) this.$body = $(document.body)
this.$element = $(element) this.$element = $(element)
this.$backdrop = this.$backdrop =
this.isShown = null this.isShown = null
this.scrollbarWidth = 0
if (this.options.remote) { if (this.options.remote) {
this.$element this.$element
@@ -830,6 +831,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.isShown = true this.isShown = true
this.checkScrollbar()
this.$body.addClass('modal-open') this.$body.addClass('modal-open')
this.setScrollbar() this.setScrollbar()
@@ -976,11 +978,14 @@ 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()
}
Modal.prototype.setScrollbar = function () { Modal.prototype.setScrollbar = function () {
if (document.body.clientHeight <= window.innerHeight) return var bodyPad = parseInt(this.$body.css('padding-right') || 0)
var scrollbarWidth = this.measureScrollbar() if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
var bodyPad = parseInt(this.$body.css('padding-right') || 0)
if (scrollbarWidth) this.$body.css('padding-right', bodyPad + scrollbarWidth)
} }
Modal.prototype.resetScrollbar = function () { Modal.prototype.resetScrollbar = function () {

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

23
js/modal.js
View File

@@ -14,11 +14,12 @@
// ====================== // ======================
var Modal = function (element, options) { var Modal = function (element, options) {
this.options = options this.options = options
this.$body = $(document.body) this.$body = $(document.body)
this.$element = $(element) this.$element = $(element)
this.$backdrop = this.$backdrop =
this.isShown = null this.isShown = null
this.scrollbarWidth = 0
if (this.options.remote) { if (this.options.remote) {
this.$element this.$element
@@ -49,6 +50,7 @@
this.isShown = true this.isShown = true
this.checkScrollbar()
this.$body.addClass('modal-open') this.$body.addClass('modal-open')
this.setScrollbar() this.setScrollbar()
@@ -195,11 +197,14 @@
} }
} }
Modal.prototype.checkScrollbar = function () {
if (document.body.clientWidth >= window.innerWidth) return
this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar()
}
Modal.prototype.setScrollbar = function () { Modal.prototype.setScrollbar = function () {
if (document.body.clientHeight <= window.innerHeight) return var bodyPad = parseInt(this.$body.css('padding-right') || 0)
var scrollbarWidth = this.measureScrollbar() if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
var bodyPad = parseInt(this.$body.css('padding-right') || 0)
if (scrollbarWidth) this.$body.css('padding-right', bodyPad + scrollbarWidth)
} }
Modal.prototype.resetScrollbar = function () { Modal.prototype.resetScrollbar = function () {