diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-07-12 23:57:55 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-07-12 23:57:55 +0200 |
| commit | 5092d0296a010280ee9d004f2fe06afbf1c45db5 (patch) | |
| tree | ac6b97b4551b4aebf8d90cc35add82fc7088e0a3 /demos/tooltip | |
| parent | 39532f0a8e70e21e33aab03f08136f662d03a4a1 (diff) | |
| parent | e054e28836e616ed03561d5a8195bbea525866d1 (diff) | |
| download | jquery-ui-5092d0296a010280ee9d004f2fe06afbf1c45db5.tar.gz jquery-ui-5092d0296a010280ee9d004f2fe06afbf1c45db5.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'demos/tooltip')
| -rw-r--r-- | demos/tooltip/custom-animation.html | 4 | ||||
| -rw-r--r-- | demos/tooltip/tracking.html | 19 | ||||
| -rw-r--r-- | demos/tooltip/video-player.html | 4 |
3 files changed, 5 insertions, 22 deletions
diff --git a/demos/tooltip/custom-animation.html b/demos/tooltip/custom-animation.html index 4452a3002..8a55e455d 100644 --- a/demos/tooltip/custom-animation.html +++ b/demos/tooltip/custom-animation.html @@ -9,8 +9,8 @@ <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.position.js"></script> <script src="../../ui/jquery.ui.tooltip.js"></script> - <script src="../../ui/jquery.effects.core.js"></script> - <script src="../../ui/jquery.effects.explode.js"></script> + <script src="../../ui/jquery.ui.effect.js"></script> + <script src="../../ui/jquery.ui.effect-explode.js"></script> <link rel="stylesheet" href="../demos.css"> <script> $(function() { diff --git a/demos/tooltip/tracking.html b/demos/tooltip/tracking.html index 9f9ce1752..ab0237da6 100644 --- a/demos/tooltip/tracking.html +++ b/demos/tooltip/tracking.html @@ -19,24 +19,7 @@ <script> $(function() { $( ".demo" ).tooltip({ - position: { - my: "left+25 center", - at: "center" - }, - open: function( event ) { - var tooltip = $( ".ui-tooltip" ), - positionOption = $( this ).tooltip( "option", "position" ); - function position( event ) { - positionOption.of = event; - tooltip.position( positionOption ); - } - $( document ).bind( "mousemove.tooltip-position", position ); - // trigger once to override element-relative positioning - position( event ); - }, - close: function() { - $( document ).unbind( "mousemove.tooltip-position" ); - } + track: true }); }); </script> diff --git a/demos/tooltip/video-player.html b/demos/tooltip/video-player.html index 55a0f83af..1e17ae163 100644 --- a/demos/tooltip/video-player.html +++ b/demos/tooltip/video-player.html @@ -11,8 +11,8 @@ <script src="../../ui/jquery.ui.tooltip.js"></script> <script src="../../ui/jquery.ui.button.js"></script> <script src="../../ui/jquery.ui.menu.js"></script> - <script src="../../ui/jquery.effects.core.js"></script> - <script src="../../ui/jquery.effects.blind.js"></script> + <script src="../../ui/jquery.ui.effect.js"></script> + <script src="../../ui/jquery.ui.effect-blind.js"></script> <link rel="stylesheet" href="../demos.css"> <style> .player { |