aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-06-17 17:57:07 -0700
committerChris Rebert <[email protected]>2014-06-17 17:57:07 -0700
commit4300d430e6fd3c332eff78fe579002c25af44c23 (patch)
tree9958aef43cb37a315f7a96575998c059a8ef5555
parent316e0c7b1bde3e69869a786bc9f21e2571088049 (diff)
parent1b63d0b9ba0fad04a8428d27bc1d141079bdfa7b (diff)
downloadbootstrap-4300d430e6fd3c332eff78fe579002c25af44c23.tar.xz
bootstrap-4300d430e6fd3c332eff78fe579002c25af44c23.zip
Merge branch 'erwanjegouzo-master'
-rw-r--r--js/tooltip.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tooltip.js b/js/tooltip.js
index 38940a384..c62a5061a 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -202,10 +202,10 @@
var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
this.applyPlacement(calculatedOffset, placement)
- this.hoverState = null
var complete = function () {
that.$element.trigger('shown.bs.' + that.type)
+ that.hoverState = null
}
$.support.transition && this.$tip.hasClass('fade') ?