aboutsummaryrefslogtreecommitdiff
path: root/js/tooltip.js
diff options
context:
space:
mode:
authorAdrien <[email protected]>2015-03-24 17:12:52 +0100
committerChris Rebert <[email protected]>2015-04-27 01:13:16 -0700
commit37a10d37c17c051830cdd2ecec698d28c0984603 (patch)
treeef52a55d3830974836ae145334622243161f6084 /js/tooltip.js
parentd0926f2debde5e920ca369ad56a07e7c8bacdd89 (diff)
downloadbootstrap-37a10d37c17c051830cdd2ecec698d28c0984603.tar.xz
bootstrap-37a10d37c17c051830cdd2ecec698d28c0984603.zip
Compare tooltip right offset to viewport right offset (and not width)
Closes #16142 by merging it.
Diffstat (limited to 'js/tooltip.js')
-rw-r--r--js/tooltip.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tooltip.js b/js/tooltip.js
index 2d42cab24..1f66413d8 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -378,7 +378,7 @@
var rightEdgeOffset = pos.left + viewportPadding + actualWidth
if (leftEdgeOffset < viewportDimensions.left) { // left overflow
delta.left = viewportDimensions.left - leftEdgeOffset
- } else if (rightEdgeOffset > viewportDimensions.width) { // right overflow
+ } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow
delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset
}
}