Merge pull request #19775 from twbs/modal-ie8-innerWidth

cvrebert · cvrebert · commit 8c678e9db7e2 · 2016-04-21T12:24:52.000-07:00
Modal: Remove IE8-specific window.innerWidth workaround
diff --git a/js/src/modal.js b/js/src/modal.js
@@ -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()
     }
 

Original file line number	Diff line number	Diff line change
`@@ -408,13 +408,7 @@ const Modal = (($) => {`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`_checkScrollbar() {`
`411`		`- let fullWindowWidth = window.innerWidth`
`412`		`- if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8`
`413`		`- let documentElementRect = document.documentElement.getBoundingClientRect()`
`414`		`- fullWindowWidth =`
`415`		`- documentElementRect.right - Math.abs(documentElementRect.left)`
`416`		`- }`
`417`		`- this._isBodyOverflowing = document.body.clientWidth < fullWindowWidth`
	`411`	`+ this._isBodyOverflowing = document.body.clientWidth < window.innerWidth`
`418`	`412`	`this._scrollbarWidth = this._getScrollbarWidth()`
`419`	`413`	`}`
`420`	`414`