Compare tooltip right offset to viewport right offset (and not width)

Intrepidd · cvrebert · commit 37a10d37c17c · 2015-04-27T01:13:16.000-07:00
Closes twbs#16142 by merging it.
diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js
@@ -764,6 +764,33 @@ $(function () {
     $styles.remove()
   })
 
+  QUnit.test('should not misplace the tip when the right edge offset is greater or equal than the viewport width', function (assert) {
+    assert.expect(2)
+    var styles = '<style>'
+        + '.tooltip, .tooltip *, .tooltip *:before, .tooltip *:after { box-sizing: border-box; }'
+        + '.tooltip, .tooltip .tooltip-inner { width: 50px; height: 50px; max-width: none; background: red; }'
+        + '.container-viewport { padding: 100px; margin-left: 100px; width: 100px; }'
+        + '</style>'
+    var $styles = $(styles).appendTo('head')
+
+    var $container = $('<div class="container-viewport"/>').appendTo(document.body)
+    var $target = $('<a href="#" rel="tooltip" title="tip">foobar</a>')
+      .appendTo($container)
+      .bootstrapTooltip({
+        viewport: '.container-viewport'
+      })
+
+    $target.bootstrapTooltip('show')
+    var $tooltip = $container.find('.tooltip')
+    assert.strictEqual(Math.round($tooltip.offset().left), Math.round($target.position().left + $target.width() / 2 - $tooltip[0].offsetWidth / 2))
+
+    $target.bootstrapTooltip('hide')
+    assert.strictEqual($('.tooltip').length, 0, 'tooltip removed from dom')
+
+    $container.remove()
+    $styles.remove()
+  })
+
   QUnit.test('should not error when trying to show an auto-placed tooltip that has been removed from the dom', function (assert) {
     assert.expect(1)
     var passed = true
diff --git 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
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@`
`378`	`378`	`var rightEdgeOffset = pos.left + viewportPadding + actualWidth`
`379`	`379`	`if (leftEdgeOffset < viewportDimensions.left) { // left overflow`
`380`	`380`	`delta.left = viewportDimensions.left - leftEdgeOffset`
`381`		`- } else if (rightEdgeOffset > viewportDimensions.width) { // right overflow`
	`381`	`+ } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow`
`382`	`382`	`delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset`
`383`	`383`	`}`
`384`	`384`	`}`