diff options
| author | Zlatan Vasović <[email protected]> | 2014-01-25 12:16:45 +0100 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-03-16 20:10:52 -0700 |
| commit | ead17b7ca6342ceb39b614d7179b9031902ea63f (patch) | |
| tree | 539945d66a8f2c9e52c6b26b8da49ff2f30241d1 | |
| parent | 0f366e03765ce1daa932562b77de78eb5f90ac28 (diff) | |
| download | bootstrap-ead17b7ca6342ceb39b614d7179b9031902ea63f.tar.xz bootstrap-ead17b7ca6342ceb39b614d7179b9031902ea63f.zip | |
Fix #12375: stop using document.body.scrollTop as it's deprecated in the strict mode
Closes #12377
| -rw-r--r-- | dist/js/bootstrap.js | 2 | ||||
| -rw-r--r-- | js/tooltip.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 5a130ff02..1bf7ffafa 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1208,7 +1208,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re var $parent = this.$element.parent() var orgPlacement = placement - var docScroll = document.documentElement.scrollTop || document.body.scrollTop + var docScroll = document.documentElement.scrollTop var parentWidth = this.options.container == 'body' ? window.innerWidth : $parent.outerWidth() var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight() var parentLeft = this.options.container == 'body' ? 0 : $parent.offset().left diff --git a/js/tooltip.js b/js/tooltip.js index 7b75d7939..eb7875c9f 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -160,7 +160,7 @@ var $parent = this.$element.parent() var orgPlacement = placement - var docScroll = document.documentElement.scrollTop || document.body.scrollTop + var docScroll = document.documentElement.scrollTop var parentWidth = this.options.container == 'body' ? window.innerWidth : $parent.outerWidth() var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight() var parentLeft = this.options.container == 'body' ? 0 : $parent.offset().left |