Skip to content

Commit d8e60e9

Browse files
jzaeffererjzaefferer
committed
Merge branch 'master' into tooltip-animations
2 parents a03c222 + 0c674ca commit d8e60e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1431
-1225
lines changed

‎demos/tabs/sortable.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@
1313
<link rel="stylesheet" href="../demos.css">
1414
<script>
1515
$(function() {
16-
$( "#tabs" ).tabs().find( ".ui-tabs-nav" ).sortable({ axis: "x" });
16+
var tabs = $( "#tabs" ).tabs();
17+
tabs.find( ".ui-tabs-nav" ).sortable({
18+
axis: "x",
19+
stop: function() {
20+
tabs.tabs( "refresh" );
21+
}
22+
});
1723
});
1824
</script>
1925
</head>

‎demos/tooltip/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h4>Examples</h4>
1414
<li><a href="tracking.html">Track the mouse</a></li>
1515
<li><a href="custom-animation.html">Custom animation</a></li>
1616
<li><a href="delegation-mixbag.html">Delegation Mixbag</a></li>
17-
<li><a href="lots.html">Lots</a></li>
17+
<li><a href="video-player.html">Video Player</a></li>
1818
</ul>
1919
</div>
2020

‎demos/tooltip/video-player.html

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>jQuery UI Tooltip - Video Player demo</title>
5+
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
6+
<script type="text/javascript" src="../../jquery-1.5.1.js"></script>
7+
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
8+
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
9+
<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
10+
<script type="text/javascript" src="../../ui/jquery.ui.tooltip.js"></script>
11+
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
12+
<script type="text/javascript" src="../../ui/jquery.ui.menu.js"></script>
13+
<script type="text/javascript" src="../../tests/visual/menu/popup.js"></script>
14+
<link type="text/css" href="../demos.css" rel="stylesheet" />
15+
<script type="text/javascript">
16+
$(function() {
17+
$("button").each(function() {
18+
$(this).button({
19+
icons: {
20+
primary: $(this).data("icon")
21+
},
22+
text: !!$(this).attr("title")
23+
});
24+
});
25+
$(".set").buttonset();
26+
27+
// TODO hide the tooltip when clicking the button
28+
$("ul").menu().popup({
29+
trigger: $(".menu")
30+
});
31+
32+
$(".demo").tooltip({
33+
position: {
34+
my: "center top",
35+
at: "center bottom+5px"
36+
},
37+
// TODO need to merge tooltip-animations for this to work
38+
hide: false
39+
});
40+
});
41+
</script>
42+
<style>
43+
.player { width: 500px; height: 300px; border: 2px groove gray; background: rgb(200, 200, 200); text-align: center; line-height: 300px; }
44+
/* TODO load from jquery.ui.popup.css */
45+
.ui-popup { position: absolute; z-index: 5000; }
46+
47+
.ui-tooltip {
48+
border: 1px solid white;
49+
background: rgba(20, 20, 20, 1);
50+
color: white;
51+
}
52+
</style>
53+
</head>
54+
<body>
55+
56+
<div class="demo">
57+
58+
<div class="player">Here Be Video (HTML5?)</div>
59+
<div class="tools">
60+
<span class="set">
61+
<button data-icon="ui-icon-circle-arrow-n" title="I like this">Like</button>
62+
<button data-icon="ui-icon-circle-arrow-s">I dislike this</button>
63+
</span>
64+
<span class="set">
65+
<button data-icon="ui-icon-circle-plus" title="Add to Watch Later">Add to</button>
66+
<button class="menu" data-icon="ui-icon-triangle-1-s">Add to favorites or playlist</button>
67+
</span>
68+
<button title="Share this video">Share</button>
69+
<button data-icon="ui-icon-alert">Flag as inappropiate</button>
70+
<ul>
71+
<li>
72+
<a href="#">Favorites</a>
73+
</li>
74+
<li>
75+
<a href="#">Watch Later</a>
76+
</li>
77+
<li>
78+
<a href="#">New Playlist...</a>
79+
</li>
80+
</ul>
81+
</div>
82+
</div>
83+
84+
</div><!-- End demo -->
85+
86+
87+
88+
<div class="demo-description">
89+
90+
<p>A fake video player with like/share/stats button, each with a custom-styled tooltip.</p>
91+
92+
</div><!-- End demo-description -->
93+
94+
95+
96+
</body>
97+
</html>

‎tests/static/menu/all-menus-icons.html

Lines changed: 0 additions & 172 deletions
This file was deleted.

‎tests/static/menu/default.html

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎tests/unit/accordion/accordion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<script src="../testsuite.js"></script>
2121

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

0 commit comments

Comments
 (0)