diff options
author | Jacob <jacobthornton@gmail.com> | 2014-09-07 21:36:45 +0400 |
---|---|---|
committer | Jacob <jacobthornton@gmail.com> | 2014-09-07 21:36:45 +0400 |
commit | c22b2705829f43ccd79f83c3e89d011a3cf5461f (patch) | |
tree | dbb444bd4ec64821f5c79c49150bf129012c13ec /js/tooltip.js | |
parent | 9f5660c3e3b3d392529d07c4f2cfe0aba2abbe89 (diff) | |
parent | aac0e16452301a4735a668dc228b6b084b2d63d0 (diff) |
Merge pull request #14273 from sgonyea/master
Fix hover-popover/tooltip flickering when mouse re-enters
Diffstat (limited to 'js/tooltip.js')
-rw-r--r-- | js/tooltip.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index e730db6e95..88ee49eac5 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -105,6 +105,11 @@ var self = obj instanceof this.constructor ? obj : $(obj.currentTarget).data('bs.' + this.type) + if (self && self.$tip && self.$tip.is(':visible')) { + self.hoverState = 'in' + return + } + if (!self) { self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) $(obj.currentTarget).data('bs.' + this.type, self) |