diff options
| -rw-r--r-- | js/tooltip.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index 68c5714cd..b305bc5ab 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -316,16 +316,20 @@ Tooltip.prototype.getPosition = function ($element) { $element = $element || this.$element + var el = $element[0] var isBody = el.tagName == 'BODY' - var isSvg = window.SVGElement && el instanceof window.SVGElement + var isSvg = window.SVGElement && el instanceof window.SVGElement + + var elRect = typeof el.getBoundingClientRect == 'function' ? el.getBoundingClientRect() : null + var elOffset = isBody ? { top: 0, left: 0 } : $element.offset() + var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } var outerDims = isSvg ? {} : { width: isBody ? $(window).width() : $element.outerWidth(), height: isBody ? $(window).height() : $element.outerHeight() } - return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : null, { - scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() - }, outerDims, isBody ? { top: 0, left: 0 } : $element.offset()) + + return $.extend({}, elRect, scroll, outerDims, elOffset) } Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { |