From: Zlatan Vasović <legospace9876@gmail.com>
Date: Sat, 25 Jan 2014 11:16:45 +0000 (+0100)
Subject: Fix #12375: stop using document.body.scrollTop as it's deprecated in the strict mode
X-Git-Tag: v3.2.0~353^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ead17b7ca6342ceb39b614d7179b9031902ea63f;p=thirdparty%2Fbootstrap.git

Fix #12375: stop using document.body.scrollTop as it's deprecated in the strict mode

Closes #12377
---

diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
index 5a130ff02e..1bf7ffafa9 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 7b75d79393..eb7875c9fe 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