From 0481ce973f2c10753e23d2de21aafb78c582a0e5 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 16 Jan 2015 17:45:58 +0200 Subject: Fix bogus JSCS warning. --- js/tooltip.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'js/tooltip.js') diff --git a/js/tooltip.js b/js/tooltip.js index a1140d247..f9adb81ef 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -346,10 +346,10 @@ } 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 } } -- cgit v1.2.3 From c683e7dea763b19e9bb172c34f74f99b926607e0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 19 Jan 2015 08:32:13 -0800 Subject: bump versions --- js/tooltip.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/tooltip.js') diff --git a/js/tooltip.js b/js/tooltip.js index f9adb81ef..1856df598 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.3.1 + * Bootstrap: tooltip.js v3.3.2 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== @@ -25,7 +25,7 @@ this.init('tooltip', element, options) } - Tooltip.VERSION = '3.3.1' + Tooltip.VERSION = '3.3.2' Tooltip.TRANSITION_DURATION = 150 -- cgit v1.2.3