Tooltip: Run _disable when disabled option is set on create. Fixes #8…

…712 - Tooltip: Disabled tooltips on initialization.
jquery · Oct 24, 2012 · ba752cf · ba752cf
1 parent 1fcccd4
commit ba752cf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js
@@ -2,6 +2,14 @@
 
 module( "tooltip: options" );
 
+test( "disabled: true", function() {
+	expect( 1 );
+	$( "#tooltipped1" ).tooltip({
+		disabled: true
+	}).tooltip( "open" );
+	equal( $( ".ui-tooltip" ).length, 0 );
+});
+
 test( "content: default", function() {
 	expect( 1 );
 	var element = $( "#tooltipped1" ).tooltip().tooltip( "open" );

diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
@@ -75,6 +75,10 @@ $.widget( "ui.tooltip", {
 		this.tooltips = {};
 		// IDs of parent tooltips where we removed the title attribute
 		this.parents = {};
+
+		if ( this.options.disabled ) {
+			this._disable();
+		}
 	},
 
 	_setOption: function( key, value ) {