aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dist/js/bootstrap.js2
-rw-r--r--js/tooltip.js2
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