Commit a3a04bfe authored by Heinrich Fenkart's avatar Heinrich Fenkart
Browse files

Merge pull request #14571 from twbs/properly-hide-tooltip-on-destroy

Properly fire hidden event when tooltip is destroyed
parents 0fe48a78 76762169
Showing with 6 additions and 2 deletions
+6 -2
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
$tip.removeClass('fade in top bottom left right') $tip.removeClass('fade in top bottom left right')
} }
Tooltip.prototype.hide = function () { Tooltip.prototype.hide = function (callback) {
var that = this var that = this
var $tip = this.tip() var $tip = this.tip()
var e = $.Event('hide.bs.' + this.type) var e = $.Event('hide.bs.' + this.type)
...@@ -291,6 +291,7 @@ ...@@ -291,6 +291,7 @@
that.$element that.$element
.removeAttr('aria-describedby') .removeAttr('aria-describedby')
.trigger('hidden.bs.' + that.type) .trigger('hidden.bs.' + that.type)
callback && callback()
} }
this.$element.trigger(e) this.$element.trigger(e)
...@@ -438,8 +439,11 @@ ...@@ -438,8 +439,11 @@
} }
Tooltip.prototype.destroy = function () { Tooltip.prototype.destroy = function () {
var that = this
clearTimeout(this.timeout) clearTimeout(this.timeout)
this.hide().$element.off('.' + this.type).removeData('bs.' + this.type) this.hide(function () {
that.$element.off('.' + that.type).removeData('bs.' + that.type)
})
} }
......
Supports Markdown
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