Merge pull request twbs#15681 from twbs/fix-replaceArrow

cvrebert · cvrebert · commit b258a1f5b081 · 2015-01-27T16:59:24.000-08:00
Fix name of Tooltip.replaceArrow() parameter
diff --git a/js/tooltip.js b/js/tooltip.js
@@ -272,10 +272,10 @@
     this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
   }
 
-  Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) {
+  Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) {
     this.arrow()
-      .css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
-      .css(isHorizontal ? 'top' : 'left', '')
+      .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
+      .css(isVertical ? 'top' : 'left', '')
   }
 
   Tooltip.prototype.setContent = function () {

Original file line number	Diff line number	Diff line change
`@@ -272,10 +272,10 @@`
`272`	`272`	`this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)`
`273`	`273`	`}`
`274`	`274`
`275`		`- Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) {`
	`275`	`+ Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) {`
`276`	`276`	`this.arrow()`
`277`		`- .css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')`
`278`		`- .css(isHorizontal ? 'top' : 'left', '')`
	`277`	`+ .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')`
	`278`	`+ .css(isVertical ? 'top' : 'left', '')`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`Tooltip.prototype.setContent = function () {`