mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge pull request #6375 from tkawachi/tooltip-events-2.3.0
Tooltips fires show, shown, hide, hidden events
This commit is contained in:
commit
0a7c840173
11
js/bootstrap-tooltip.js
vendored
11
js/bootstrap-tooltip.js
vendored
@ -110,8 +110,11 @@
|
|||||||
, actualHeight
|
, actualHeight
|
||||||
, placement
|
, placement
|
||||||
, tp
|
, tp
|
||||||
|
, e = $.Event('show')
|
||||||
|
|
||||||
if (this.hasContent() && this.enabled) {
|
if (this.hasContent() && this.enabled) {
|
||||||
|
this.$element.trigger(e)
|
||||||
|
if (e.isDefaultPrevented()) return
|
||||||
$tip = this.tip()
|
$tip = this.tip()
|
||||||
this.setContent()
|
this.setContent()
|
||||||
|
|
||||||
@ -152,6 +155,8 @@
|
|||||||
.offset(tp)
|
.offset(tp)
|
||||||
.addClass(placement)
|
.addClass(placement)
|
||||||
.addClass('in')
|
.addClass('in')
|
||||||
|
|
||||||
|
this.$element.trigger('shown')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -166,6 +171,10 @@
|
|||||||
, hide: function () {
|
, hide: function () {
|
||||||
var that = this
|
var that = this
|
||||||
, $tip = this.tip()
|
, $tip = this.tip()
|
||||||
|
, e = $.Event('hide')
|
||||||
|
|
||||||
|
this.$element.trigger(e)
|
||||||
|
if (e.isDefaultPrevented()) return
|
||||||
|
|
||||||
$tip.removeClass('in')
|
$tip.removeClass('in')
|
||||||
|
|
||||||
@ -184,6 +193,8 @@
|
|||||||
removeWithAnimation() :
|
removeWithAnimation() :
|
||||||
$tip.detach()
|
$tip.detach()
|
||||||
|
|
||||||
|
this.$element.trigger('hidden')
|
||||||
|
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
|
77
js/tests/unit/bootstrap-tooltip.js
vendored
77
js/tests/unit/bootstrap-tooltip.js
vendored
@ -66,6 +66,83 @@ $(function () {
|
|||||||
ok(!$(".tooltip").length, 'tooltip removed')
|
ok(!$(".tooltip").length, 'tooltip removed')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test("should fire show event", function () {
|
||||||
|
stop()
|
||||||
|
var tooltip = $('<div title="tooltip title"></div>')
|
||||||
|
.bind("show", function() {
|
||||||
|
ok(true, "show was called")
|
||||||
|
start()
|
||||||
|
})
|
||||||
|
.tooltip('show')
|
||||||
|
})
|
||||||
|
|
||||||
|
test("should fire shown event", function () {
|
||||||
|
stop()
|
||||||
|
var tooltip = $('<div title="tooltip title"></div>')
|
||||||
|
.bind("shown", function() {
|
||||||
|
ok(true, "shown was called")
|
||||||
|
start()
|
||||||
|
})
|
||||||
|
.tooltip('show')
|
||||||
|
})
|
||||||
|
|
||||||
|
test("should not fire shown event when default prevented", function () {
|
||||||
|
stop()
|
||||||
|
var tooltip = $('<div title="tooltip title"></div>')
|
||||||
|
.bind("show", function(e) {
|
||||||
|
e.preventDefault()
|
||||||
|
ok(true, "show was called")
|
||||||
|
start()
|
||||||
|
})
|
||||||
|
.bind("shown", function() {
|
||||||
|
ok(false, "shown was called")
|
||||||
|
})
|
||||||
|
.tooltip('show')
|
||||||
|
})
|
||||||
|
|
||||||
|
test("should fire hide event", function () {
|
||||||
|
stop()
|
||||||
|
var tooltip = $('<div title="tooltip title"></div>')
|
||||||
|
.bind("shown", function() {
|
||||||
|
$(this).tooltip('hide')
|
||||||
|
})
|
||||||
|
.bind("hide", function() {
|
||||||
|
ok(true, "hide was called")
|
||||||
|
start()
|
||||||
|
})
|
||||||
|
.tooltip('show')
|
||||||
|
})
|
||||||
|
|
||||||
|
test("should fire hidden event", function () {
|
||||||
|
stop()
|
||||||
|
var tooltip = $('<div title="tooltip title"></div>')
|
||||||
|
.bind("shown", function() {
|
||||||
|
$(this).tooltip('hide')
|
||||||
|
})
|
||||||
|
.bind("hidden", function() {
|
||||||
|
ok(true, "hidden was called")
|
||||||
|
start()
|
||||||
|
})
|
||||||
|
.tooltip('show')
|
||||||
|
})
|
||||||
|
|
||||||
|
test("should not fire hidden event when default prevented", function () {
|
||||||
|
stop()
|
||||||
|
var tooltip = $('<div title="tooltip title"></div>')
|
||||||
|
.bind("shown", function() {
|
||||||
|
$(this).tooltip('hide')
|
||||||
|
})
|
||||||
|
.bind("hide", function(e) {
|
||||||
|
e.preventDefault()
|
||||||
|
ok(true, "hide was called")
|
||||||
|
start()
|
||||||
|
})
|
||||||
|
.bind("hidden", function() {
|
||||||
|
ok(false, "hidden was called")
|
||||||
|
})
|
||||||
|
.tooltip('show')
|
||||||
|
})
|
||||||
|
|
||||||
test("should not show tooltip if leave event occurs before delay expires", function () {
|
test("should not show tooltip if leave event occurs before delay expires", function () {
|
||||||
var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
|
var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
|
||||||
.appendTo('#qunit-fixture')
|
.appendTo('#qunit-fixture')
|
||||||
|
Loading…
Reference in New Issue
Block a user