Skip to content
Permalink
Browse files

Merge branch 'master' into tooltip-animations

  • Loading branch information...
jzaefferer committed May 2, 2011
2 parents a03c222 + 0c674ca commit d8e60e9a8a6898ea3dfc710c554d9bfe13b0f77e
Showing with 1,431 additions and 1,225 deletions.
  1. +7 −1 demos/tabs/sortable.html
  2. +1 −1 demos/tooltip/index.html
  3. +97 −0 demos/tooltip/video-player.html
  4. +0 −172 tests/static/menu/all-menus-icons.html
  5. +0 −39 tests/static/menu/default.html
  6. +1 −1 tests/unit/accordion/accordion.html
  7. +14 −14 tests/unit/accordion/accordion_core.js
  8. +6 −1 tests/unit/accordion/accordion_defaults.js
  9. +8 −1 tests/unit/accordion/accordion_defaults_deprecated.js
  10. +1 −1 tests/unit/accordion/accordion_deprecated.html
  11. +99 −99 tests/unit/accordion/accordion_deprecated.js
  12. +29 −29 tests/unit/accordion/accordion_events.js
  13. +13 −13 tests/unit/accordion/accordion_methods.js
  14. +111 −111 tests/unit/accordion/accordion_options.js
  15. +24 −18 tests/unit/autocomplete/autocomplete_defaults.js
  16. +12 −13 tests/unit/button/button_defaults.js
  17. +33 −34 tests/unit/dialog/dialog_defaults.js
  18. +2 −2 tests/unit/dialog/dialog_options.js
  19. +10 −11 tests/unit/menu/menu_defaults.js
  20. +9 −10 tests/unit/progressbar/progressbar_defaults.js
  21. +18 −19 tests/unit/slider/slider_defaults.js
  22. +14 −15 tests/unit/spinner/spinner_defaults.js
  23. +48 −1 tests/unit/tabs/tabs.html
  24. +16 −0 tests/unit/tabs/tabs_core.js
  25. +6 −3 tests/unit/tabs/tabs_defaults.js
  26. +13 −10 tests/unit/tabs/tabs_defaults_deprecated.js
  27. +48 −1 tests/unit/tabs/tabs_deprecated.html
  28. +93 −57 tests/unit/tabs/tabs_deprecated.js
  29. +128 −132 tests/unit/tabs/tabs_methods.js
  30. +13 −1 tests/unit/tabs/tabs_options.js
  31. +0 −62 tests/unit/tabs/tabs_tickets.js
  32. +13 −14 tests/unit/tooltip/tooltip_defaults.js
  33. +3 −0 tests/unit/widget/widget_core.js
  34. +41 −3 tests/visual/menu/menu.html
  35. +120 −96 tests/visual/menu/menubar.html
  36. +84 −39 tests/visual/menu/menubar.js
  37. +12 −1 tests/visual/menu/popup.js
  38. +12 −5 themes/base/jquery.ui.menu.css
  39. +1 −1 themes/base/jquery.ui.resizable.css
  40. +1 −1 ui/i18n/jquery.ui.datepicker-nl.js
  41. +1 −1 ui/i18n/jquery.ui.datepicker-sk.js
  42. +24 −25 ui/jquery.effects.core.js
  43. +10 −1 ui/jquery.ui.accordion.js
  44. +10 −1 ui/jquery.ui.autocomplete.js
  45. +25 −21 ui/jquery.ui.core.js
  46. +62 −38 ui/jquery.ui.menu.js
  47. +134 −105 ui/jquery.ui.tabs.js
  48. +4 −1 ui/jquery.ui.widget.js
@@ -13,7 +13,13 @@
<link rel="stylesheet" href="../demos.css">
<script>
$(function() {
$( "#tabs" ).tabs().find( ".ui-tabs-nav" ).sortable({ axis: "x" });
var tabs = $( "#tabs" ).tabs();
tabs.find( ".ui-tabs-nav" ).sortable({
axis: "x",
stop: function() {
tabs.tabs( "refresh" );
}
});
});
</script>
</head>
@@ -14,7 +14,7 @@ <h4>Examples</h4>
<li><a href="tracking.html">Track the mouse</a></li>
<li><a href="custom-animation.html">Custom animation</a></li>
<li><a href="delegation-mixbag.html">Delegation Mixbag</a></li>
<li><a href="lots.html">Lots</a></li>
<li><a href="video-player.html">Video Player</a></li>
</ul>
</div>

@@ -0,0 +1,97 @@
<!doctype html>
<html lang="en">
<head>
<title>jQuery UI Tooltip - Video Player demo</title>
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
<script type="text/javascript" src="../../jquery-1.5.1.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.tooltip.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
<script type="text/javascript" src="../../ui/jquery.ui.menu.js"></script>
<script type="text/javascript" src="../../tests/visual/menu/popup.js"></script>
<link type="text/css" href="../demos.css" rel="stylesheet" />
<script type="text/javascript">
$(function() {
$("button").each(function() {
$(this).button({
icons: {
primary: $(this).data("icon")
},
text: !!$(this).attr("title")
});
});
$(".set").buttonset();
// TODO hide the tooltip when clicking the button
$("ul").menu().popup({
trigger: $(".menu")
});
$(".demo").tooltip({
position: {
my: "center top",
at: "center bottom+5px"
},
// TODO need to merge tooltip-animations for this to work
hide: false
});
});
</script>
<style>
.player { width: 500px; height: 300px; border: 2px groove gray; background: rgb(200, 200, 200); text-align: center; line-height: 300px; }
/* TODO load from jquery.ui.popup.css */
.ui-popup { position: absolute; z-index: 5000; }
.ui-tooltip {
border: 1px solid white;
background: rgba(20, 20, 20, 1);
color: white;
}
</style>
</head>
<body>

<div class="demo">

<div class="player">Here Be Video (HTML5?)</div>
<div class="tools">
<span class="set">
<button data-icon="ui-icon-circle-arrow-n" title="I like this">Like</button>
<button data-icon="ui-icon-circle-arrow-s">I dislike this</button>
</span>
<span 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>
</span>
<button title="Share this video">Share</button>
<button data-icon="ui-icon-alert">Flag as inappropiate</button>
<ul>
<li>
<a href="#">Favorites</a>
</li>
<li>
<a href="#">Watch Later</a>
</li>
<li>
<a href="#">New Playlist...</a>
</li>
</ul>
</div>
</div>

</div><!-- End demo -->



<div class="demo-description">

<p>A fake video player with like/share/stats button, each with a custom-styled tooltip.</p>

</div><!-- End demo-description -->



</body>
</html>

This file was deleted.

This file was deleted.

@@ -20,7 +20,7 @@
<script src="../testsuite.js"></script>

<script>
function state( accordion ) {
function accordion_state( accordion ) {
var expected = $.makeArray( arguments ).slice( 1 );
var actual = accordion.find( ".ui-accordion-content" ).map(function() {
return $( this ).css( "display" ) === "none" ? 0 : 1;

0 comments on commit d8e60e9

Please sign in to comment.
You can’t perform that action at this time.