rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #3655 from jorgenfb/8dda83906d72ade81ecf9b21d55b5a2922589d30

Browse Source 
Updated unit test for tooltips. Now using is() instead of hasClass()
This commit is contained in:
Jacob Thornton 2012-05-31 09:03:53 -07:00
commit bcd5097c02
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/bootstrap-tooltip.js vendored
View File

@ -84,9 +84,9 @@
, leave: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (this.timeout) clearTimeout(this.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide()
clearTimeout(this.timeout)
self.hoverState = 'out'
this.timeout = setTimeout(function() {
if (self.hoverState == 'out') self.hide()
@ -272,4 +272,4 @@
, delay: 0
}
}(window.jQuery);
}(window.jQuery);

35
js/tests/unit/bootstrap-tooltip.js vendored
View File

@ -33,7 +33,7 @@ $(function () {
.tooltip({placement: 'bottom'})
.tooltip('show')
ok($(".tooltip").hasClass('fade bottom in'), 'has correct classes applied')
ok($(".tooltip").is('.fade.bottom.in'), 'has correct classes applied')
tooltip.tooltip('hide')
})
@ -69,10 +69,29 @@ $(function () {
tooltip.trigger('mouseenter')
setTimeout(function () {
ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in')
ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
tooltip.trigger('mouseout')
setTimeout(function () {
ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in')
ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
start()
}, 200)
}, 100)
})
test("should not show tooltip if leave event occurs before delay expires, even if hide delay is 0", function () {
var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
.appendTo('#qunit-fixture')
.tooltip({ delay: { show: 200, hide: 0} })
stop()
tooltip.trigger('mouseenter')
setTimeout(function () {
ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
tooltip.trigger('mouseout')
setTimeout(function () {
ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
start()
}, 200)
}, 100)
@ -85,10 +104,10 @@ $(function () {
stop()
tooltip.trigger('mouseenter')
setTimeout(function () {
ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in')
ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
tooltip.trigger('mouseout')
setTimeout(function () {
ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in')
ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
start()
}, 100)
}, 50)
@ -101,9 +120,9 @@ $(function () {
stop()
tooltip.trigger('mouseenter')
setTimeout(function () {
ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in')
ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
setTimeout(function () {
ok(!$(".tooltip").hasClass('fade in'), 'tooltip has faded in')
ok(!$(".tooltip").is('.fade.in'), 'tooltip has faded in')
start()
}, 200)
}, 100)
@ -133,4 +152,4 @@ $(function () {
ok($.fn.tooltip.Constructor.prototype.isHTML($('<div></div>')), 'correctly detected html')
})
})
})