Skip to content

B
bootstrap
Commit 4300d430 authored by Chris Rebert's avatar Chris Rebert
Browse files
Options

Merge branch 'erwanjegouzo-master'

parents 316e0c7b 1b63d0b9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
js/tooltip.js
View file @ 4300d430
...@@ -202,10 +202,10 @@ ...@@ -202,10 +202,10 @@
var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
this.applyPlacement(calculatedOffset, placement) this.applyPlacement(calculatedOffset, placement)
this.hoverState = null
var complete = function () { var complete = function () {
that.$element.trigger('shown.bs.' + that.type) that.$element.trigger('shown.bs.' + that.type)
that.hoverState = null
} }
$.support.transition && this.$tip.hasClass('fade') ? $.support.transition && this.$tip.hasClass('fade') ?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment