diff options
| author | Felix Nagel <info@felixnagel.com> | 2015-12-02 18:20:54 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2015-12-02 18:30:05 +0100 |
| commit | c10ef0a170218ae64abaee54518b09068eadb51e (patch) | |
| tree | 8ff6c9cb8e0f4a8846a3b272a26e65fef946ae3c /ui/widgets/tooltip.js | |
| parent | 7ed45541096b58c56c4fc40b1a0ca9c10b2fe229 (diff) | |
| parent | 6c738d961d9918f75a3043a49ab21ac79bca45ae (diff) | |
| download | jquery-ui-c10ef0a170218ae64abaee54518b09068eadb51e.tar.gz jquery-ui-c10ef0a170218ae64abaee54518b09068eadb51e.zip | |
Merge branch 'master' into datepicker
Diffstat (limited to 'ui/widgets/tooltip.js')
| -rw-r--r-- | ui/widgets/tooltip.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/widgets/tooltip.js b/ui/widgets/tooltip.js index daf783a98..94021092a 100644 --- a/ui/widgets/tooltip.js +++ b/ui/widgets/tooltip.js @@ -12,9 +12,9 @@ //>>description: Shows additional information for any element on hover or focus. //>>docs: http://api.jqueryui.com/tooltip/ //>>demos: http://jqueryui.com/tooltip/ -//>>css.structure: ../themes/base/core.css -//>>css.structure: ../themes/base/tooltip.css -//>>css.theme: ../themes/base/theme.css +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/tooltip.css +//>>css.theme: ../../themes/base/theme.css ( function( factory ) { if ( typeof define === "function" && define.amd ) { @@ -318,7 +318,8 @@ $.widget( "ui.tooltip", { // Handle tracking tooltips that are shown with a delay (#8644). As soon // as the tooltip is visible, position the tooltip using the most recent // event. - if ( this.options.show && this.options.show.delay ) { + // Adds the check to add the timers only when both delay and track options are set (#14682) + if ( this.options.track && this.options.show && this.options.show.delay ) { delayedShow = this.delayedShow = setInterval( function() { if ( tooltip.is( ":visible" ) ) { position( positionOption.of ); |