aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/unit/tooltip/tooltip_core.js13
-rw-r--r--ui/jquery.ui.tooltip.js2
2 files changed, 14 insertions, 1 deletions
diff --git a/tests/unit/tooltip/tooltip_core.js b/tests/unit/tooltip/tooltip_core.js
index f0aed72aa..69936dba2 100644
--- a/tests/unit/tooltip/tooltip_core.js
+++ b/tests/unit/tooltip/tooltip_core.js
@@ -94,4 +94,17 @@ test( "form containing an input with name title", function() {
equal( $( ".ui-tooltip" ).length, 0, "no tooltip for form" );
});
+test( "tooltip on .ui-state-disabled element", function() {
+ expect( 2 );
+
+ var container = $( "#contains-tooltipped" ).tooltip(),
+ element = $( "#contained-tooltipped" ).addClass( "ui-state-disabled" );
+
+ element.trigger( "mouseover" );
+ equal( $( ".ui-tooltip" ).length, 1 );
+
+ container.empty();
+ equal( $( ".ui-tooltip" ).length, 0 );
+});
+
}( jQuery ) );
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index 5145884a3..e5b496bee 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -299,7 +299,7 @@ $.widget( "ui.tooltip", {
if ( !event || event.type === "focusin" ) {
events.focusout = "close";
}
- this._on( target, events );
+ this._on( true, target, events );
},
close: function( event ) {