diff options
| author | Jacob Thornton <[email protected]> | 2013-08-08 23:08:40 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-08-08 23:08:40 -0700 |
| commit | e46708f7cee19ebe4acf04c71ef71947e6c2e20f (patch) | |
| tree | 3d98f2451e509e4b3b43d5304e63d1878411d8a4 /js/tooltip.js | |
| parent | dec00eeeafaa1272b8fc3754b8d134e8d358a6ed (diff) | |
| parent | f86f6ee9555819468467d48387becf80c831d34f (diff) | |
| download | bootstrap-e46708f7cee19ebe4acf04c71ef71947e6c2e20f.tar.xz bootstrap-e46708f7cee19ebe4acf04c71ef71947e6c2e20f.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'js/tooltip.js')
| -rw-r--r-- | js/tooltip.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index 8f2beedce..cd4ee50ed 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -179,7 +179,7 @@ .addClass(placement) } - var calculatedOffset = this.getCalcuatedOffset(placement, pos, actualWidth, actualHeight) + var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) this.applyPlacement(calculatedOffset, placement) this.$element.trigger('shown.bs.' + this.type) @@ -292,7 +292,7 @@ }, this.$element.offset()) } - Tooltip.prototype.getCalcuatedOffset = function (placement, pos, actualWidth, actualHeight) { + Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : |