From acc5f6575698b8cbaf18892842301c10303c4502 Mon Sep 17 00:00:00 2001 From: Quentin Spencer-Harper Date: Tue, 13 Jan 2015 14:59:47 +0000 Subject: [PATCH] Tooltip: Avoid creating an unnecessary tooltip when `Tooltip#hide` is called Fixed performance bug where a tooltip element is created and then immediately destroyed when tooltip.hide() is called and there is no existing tooltip element Resolves #15557 by merging it. --- js/tooltip.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/tooltip.js b/js/tooltip.js index 0467c71d18..7f89a37ac8 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -292,7 +292,7 @@ Tooltip.prototype.hide = function (callback) { var that = this - var $tip = this.tip() + var $tip = $(this.$tip) var e = $.Event('hide.bs.' + this.type) function complete() { @@ -309,7 +309,7 @@ $tip.removeClass('in') - $.support.transition && this.$tip.hasClass('fade') ? + $.support.transition && $tip.hasClass('fade') ? $tip .one('bsTransitionEnd', complete) .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : -- 2.47.2