diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-10-24 10:00:39 -0400 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-10-24 10:02:21 -0400 |
| commit | ba752cf7eda841ded93688ab3167b5515fa1660c (patch) | |
| tree | 5520ed37429e77725d905481a0cf7e4f39b105bf | |
| parent | 1fcccd45ce0eb73c4f54650d7929d788847f3e37 (diff) | |
| download | jquery-ui-ba752cf7eda841ded93688ab3167b5515fa1660c.tar.gz jquery-ui-ba752cf7eda841ded93688ab3167b5515fa1660c.zip | |
Tooltip: Run _disable when disabled option is set on create. Fixes #8712 - Tooltip: Disabled tooltips on initialization.
| -rw-r--r-- | tests/unit/tooltip/tooltip_options.js | 8 | ||||
| -rw-r--r-- | ui/jquery.ui.tooltip.js | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js index 3be651855..9f0de2b57 100644 --- 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 index 43788a082..f93dd7a2f 100644 --- 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 ) { |