summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-11-09 13:07:53 -0500
committerScott González <scott.gonzalez@gmail.com>2012-11-13 10:57:13 -0500
commitb5cf5b6ad88321eb17cd4a061430db9057eea96f (patch)
tree7fffae4e8c89f1cf61a641bb14d8f6f66d53a987
parent0ad6d7a4a9f8a96b478c527f7afc8c33439e0426 (diff)
downloadjquery-ui-b5cf5b6ad88321eb17cd4a061430db9057eea96f.tar.gz
jquery-ui-b5cf5b6ad88321eb17cd4a061430db9057eea96f.zip
Tooltip: Ignore disabled checks when closing. Fixes #8758 - Tooltip: Tooltip is shown, but not hidden if element has class=ui-state-disabled.
(cherry picked from commit 498aadf644ddca86de838dc2001267ded972df2c)
-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 732b7c468..a113c20be 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 ) {