From: Bootstrap's Grunt bot Date: Fri, 16 Jan 2015 16:41:05 +0000 (+0000) Subject: automatic grunt dist X-Git-Tag: v3.3.2~5^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7c332f183d52c6b1432a4eb511b8c61478bfc81;p=thirdparty%2Fbootstrap.git automatic grunt dist --- diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index ab0ae1e5b9..705412c38a 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1573,10 +1573,10 @@ if (typeof jQuery === 'undefined') { } 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 } : + 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 } : - /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } + /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } }