diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-01-04 16:40:44 +0100 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-01-04 16:42:16 +0100 |
| commit | 85348eeebed3521b5eea78d8930ee086c08cd62e (patch) | |
| tree | 0a3a928b48a0fa74d08eab8951dbc4beaea9008b /demos/tooltip | |
| parent | f0007ec74526979837c93be13bf181b3cf57c2ce (diff) | |
| download | jquery-ui-85348eeebed3521b5eea78d8930ee086c08cd62e.tar.gz jquery-ui-85348eeebed3521b5eea78d8930ee086c08cd62e.zip | |
Menubar/Popup: Remove both to streamline the 1.9 release. Will revert this delete on the menubar branch, while development on master can continue without them.
Diffstat (limited to 'demos/tooltip')
| -rw-r--r-- | demos/tooltip/video-player.html | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/demos/tooltip/video-player.html b/demos/tooltip/video-player.html index 365934f72..8ac0338fd 100644 --- a/demos/tooltip/video-player.html +++ b/demos/tooltip/video-player.html @@ -11,7 +11,6 @@ <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.ui.popup.js"></script> <script src="../../ui/jquery.effects.core.js"></script> <script src="../../ui/jquery.effects.blind.js"></script> <link rel="stylesheet" href="../demos.css"> @@ -69,14 +68,6 @@ $( this ).remove(); }); } - $( "ul" ).menu({ - select: function( event, ui ) { - // TODO should probably be handled by popup, see ESCAPE key handler - // affects key handling - $( this ).prev().focus(); - notify( ui.item ); - } - }).popup(); $( "button" ).each(function() { var button = $( this ).button({ @@ -85,15 +76,9 @@ }, text: !!$( this ).attr( "title" ) }); - if ( button.next().is( ":ui-popup" ) ) { - button.click(function( event ) { - $( ".demo" ).tooltip( "close", event ); - }); - } else { - button.click(function() { - notify( button ); - }); - } + button.click(function() { + notify( button ); + }); }); $( ".set" ).buttonset({ items: "button" @@ -127,17 +112,6 @@ <div class="set"> <button data-icon="ui-icon-circle-plus" title="Add to Watch Later">Add to</button> <button class="menu" data-icon="ui-icon-triangle-1-s">Add to favorites or playlist</button> - <ul> - <li> - <a href="#">Favorites</a> - </li> - <li> - <a href="#">Watch Later</a> - </li> - <li> - <a href="#">New Playlist...</a> - </li> - </ul> </div> <button title="Share this video">Share</button> <button data-icon="ui-icon-alert">Flag as inappropiate</button> |