Skip to content

B
bootstrap
Commit ccd4c9d7 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

fixes #8864

parent e9413315
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
dist/js/bootstrap.js
View file @ ccd4c9d7
...@@ -1313,6 +1313,8 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") } ...@@ -1313,6 +1313,8 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
var $tip = this.tip() var $tip = this.tip()
var e = $.Event('hide.bs.' + this.type) var e = $.Event('hide.bs.' + this.type)
function complete() { $tip.detach() }
this.$element.trigger(e) this.$element.trigger(e)
if (e.isDefaultPrevented()) return if (e.isDefaultPrevented()) return
...@@ -1321,9 +1323,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") } ...@@ -1321,9 +1323,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
$.support.transition && this.$tip.hasClass('fade') ? $.support.transition && this.$tip.hasClass('fade') ?
$tip $tip
.one($.support.transition.end, $tip.detach) .one($.support.transition.end, complete)
.emulateTransitionEnd(150) : .emulateTransitionEnd(150) :
$tip.detach() complete()
this.$element.trigger('hidden.bs.' + this.type) this.$element.trigger('hidden.bs.' + this.type)
......
dist/js/bootstrap.min.js
View file @ ccd4c9d7
This diff is collapsed.
js/tooltip.js
View file @ ccd4c9d7
...@@ -249,6 +249,8 @@ ...@@ -249,6 +249,8 @@
var $tip = this.tip() var $tip = this.tip()
var e = $.Event('hide.bs.' + this.type) var e = $.Event('hide.bs.' + this.type)
function complete() { $tip.detach() }
this.$element.trigger(e) this.$element.trigger(e)
if (e.isDefaultPrevented()) return if (e.isDefaultPrevented()) return
...@@ -257,9 +259,9 @@ ...@@ -257,9 +259,9 @@
$.support.transition && this.$tip.hasClass('fade') ? $.support.transition && this.$tip.hasClass('fade') ?
$tip $tip
.one($.support.transition.end, $tip.detach) .one($.support.transition.end, complete)
.emulateTransitionEnd(150) : .emulateTransitionEnd(150) :
$tip.detach() complete()
this.$element.trigger('hidden.bs.' + this.type) this.$element.trigger('hidden.bs.' + this.type)
......
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