Skip to content

Commit f8e7a2d

Browse files
jzaeffererjzaefferer
committed
Merge branch 'master' into mask
Conflicts: tests/unit/all.html
2 parents b21fc2f + ae0c4e4 commit f8e7a2d

File tree

170 files changed

+32821
-5787
lines changed

Some content is hidden

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

170 files changed

+32821
-5787
lines changed

‎demos/menu/contextmenu.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@
4646
<li><a href="#Utrecht">Utrecht</a></li>
4747
<li><a href="#Zurich">Zurich</a></li>
4848
</ul>
49-
49+
5050
<div id="log"></div>
5151

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

5454
<div class="demo-description">
5555

56-
<p>TODO update - A simple contextmenu: Click the button, or tab to it and hit space to open the menu. Use the mouse or cursor keys to select an item, click it or hit enter to select it.</p>
56+
<p>A simple contextmenu: Click the button, or tab to it and hit space to open the menu. Use the mouse or cursor keys to select an item, click it or hit enter to select it.</p>
5757

5858
<p>The keyboard handling is part of the menu. Using the input option to menu is configured to add the key event handlers to the button, as that button gets focused when clicked.</p>
5959

‎demos/menu/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ <h4>Examples</h4>
1111
<ul>
1212
<li class="demo-config-on"><a href="default.html">Default functionality</a></li>
1313
<li><a href="contextmenu.html">Contextmenu</a></li>
14+
<li><a href="topalignmenu.html">Top-aligned sub menus</a></li>
15+
<li><a href="navigationmenu.html">Navigation menu</a></li>
1416
</ul>
1517
</div>
1618
</body>

‎demos/menu/navigationmenu.html

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<title>jQuery UI Menu - Navigation Menu demo</title>
6+
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
7+
<script src="../../jquery-1.6.2.js"></script>
8+
<script src="../../ui/jquery.ui.core.js"></script>
9+
<script src="../../ui/jquery.ui.widget.js"></script>
10+
<script src="../../ui/jquery.ui.position.js"></script>
11+
<script src="../../ui/jquery.ui.menu.js"></script>
12+
<link href="../demos.css" rel="stylesheet" />
13+
<script>
14+
$(function() {
15+
$("#navMenu").menu({
16+
select: function( event, ui ) {
17+
var link = ui.item.children( "a:first" );
18+
if ( link.attr( "target" ) || event.metaKey || event.shiftKey || event.ctrlKey ) {
19+
return;
20+
}
21+
location.href = link.attr( "href" );
22+
}
23+
});
24+
});
25+
</script>
26+
<style>
27+
body { font-size:62.5%; }
28+
.ui-menu { width: 200px; margin-bottom: 2em; }
29+
</style>
30+
</head>
31+
<body>
32+
33+
<div class="demo">
34+
35+
<ul id="navMenu">
36+
<li><a href="?Aberdeen">Aberdeen</a></li>
37+
<li><a href="?Ada">Ada</a></li>
38+
<li><a href="?Adamsville">Adamsville</a></li>
39+
<li><a href="?Addyston">Addyston</a></li>
40+
<li>
41+
<a href="?Delphi">Delphi</a>
42+
<ul>
43+
<li><a href="?Ada">Ada</a></li>
44+
<li><a href="?Saarland">Saarland</a></li>
45+
<li><a href="?Salzburg">Salzburg</a></li>
46+
</ul>
47+
</li>
48+
<li><a href="?Saarland">Saarland</a></li>
49+
<li>
50+
<a href="?Salzburg">Salzburg</a>
51+
<ul>
52+
<li>
53+
<a href="?Delphi">Delphi</a>
54+
<ul>
55+
<li><a href="?Ada">Ada</a></li>
56+
<li><a href="?Saarland">Saarland</a></li>
57+
<li><a href="?Salzburg">Salzburg</a></li>
58+
</ul>
59+
</li>
60+
<li>
61+
<a href="?Delphi">Delphi</a>
62+
<ul>
63+
<li><a href="?Ada">Ada</a></li>
64+
<li><a href="?Saarland">Saarland</a></li>
65+
<li><a href="?Salzburg">Salzburg</a></li>
66+
</ul>
67+
</li>
68+
<li><a href="?Perch">Perch</a></li>
69+
</ul>
70+
</li>
71+
</ul>
72+
73+
</div><!-- End demo -->
74+
75+
<div class="demo-description">
76+
77+
<p>A navigation menu. A list is transformed, adding themeing, mouse and keyboard navigation support. Try to tab to the menu and use the cursor keys to navigate.</p>
78+
79+
</div><!-- End demo-description -->
80+
81+
82+
83+
</body>
84+
</html>

‎demos/menu/topalignmenu.html

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<title>Menu Demo: Top-aligned Menu</title>
5+
<link rel="stylesheet" href="../demos.css" type="text/css" />
6+
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" />
7+
<script type="text/javascript" src="../../jquery-1.6.2.js"></script>
8+
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
9+
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
10+
<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
11+
<script type="text/javascript" src="../../ui/jquery.ui.menu.js"></script>
12+
<script type="text/javascript">
13+
$(function() {
14+
$("#topMenu").menu({
15+
position: { of: "ul:has(a.ui-state-focus):last" }
16+
});
17+
});
18+
</script>
19+
<style>
20+
.ui-menu { width: 200px; margin-bottom: 2em; }
21+
</style>
22+
</head>
23+
<body>
24+
25+
<ul id="topMenu">
26+
<li><a href="#">Aberdeen</a></li>
27+
<li><a href="#">Ada</a></li>
28+
<li><a href="#">Adamsville</a></li>
29+
<li><a href="#">Addyston</a></li>
30+
<li>
31+
<a href="#">Delphi</a>
32+
<ul>
33+
<li><a href="#">Ada</a></li>
34+
<li><a href="#">Saarland</a></li>
35+
<li><a href="#">Salzburg</a></li>
36+
</ul>
37+
</li>
38+
<li><a href="#">Saarland</a></li>
39+
<li>
40+
<a href="#">Salzburg</a>
41+
<ul>
42+
<li>
43+
<a href="#">Delphi</a>
44+
<ul>
45+
<li><a href="#">Ada</a></li>
46+
<li><a href="#">Saarland</a></li>
47+
<li><a href="#">Salzburg</a></li>
48+
</ul>
49+
</li>
50+
<li>
51+
<a href="#">Adamsville</a>
52+
<ul>
53+
<li><a href="#">Aberdeen</a></li>
54+
<li><a href="#">Ada</a></li>
55+
<li><a href="#">Adamsville</a></li>
56+
<li><a href="#">Addyston</a></li>
57+
<li>
58+
<a href="#">Delphi</a>
59+
<ul>
60+
<li><a href="#">Ada</a></li>
61+
<li><a href="#">Saarland</a></li>
62+
<li><a href="#">Salzburg</a></li>
63+
</ul>
64+
</li>
65+
<li><a href="#">Saarland</a></li>
66+
</ul>
67+
</li>
68+
<li><a href="#">Perch</a>
69+
<ul>
70+
<li><a href="#">Addyston</a></li>
71+
<li><a href="#">Delphi</a></li>
72+
<li><a href="#">Perch</a></li>
73+
</ul>
74+
</li>
75+
</ul>
76+
</li>
77+
</ul>
78+
79+
</body>
80+
</html>

‎demos/position/default.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,13 @@
142142
<select id="collision_horizontal">
143143
<option value="flip">flip</option>
144144
<option value="fit">fit</option>
145+
<option value="flipfit">flipfit</option>
145146
<option value="none">none</option>
146147
</select>
147148
<select id="collision_vertical">
148149
<option value="flip">flip</option>
149150
<option value="fit">fit</option>
151+
<option value="flipfit">flipfit</option>
150152
<option value="none">none</option>
151153
</select>
152154
</div>

‎demos/spinner/currency.html

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
1-
<!DOCTYPE html>
2-
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<title>jQuery UI Spinner - Default functionality</title>
6-
<link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
7-
<script type="text/javascript" src="../../jquery-1.6.2.js"></script>
8-
<script type="text/javascript" src="../../external/jquery.mousewheel-3.0.4.js"></script>
9-
<script type="text/javascript" src="../../external/jquery.global.js"></script>
10-
<script type="text/javascript" src="../../external/jquery.global.de-DE.js"></script>
11-
<script type="text/javascript" src="../../external/jquery.global.ja-JP.js"></script>
12-
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
13-
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
14-
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
15-
<script type="text/javascript" src="../../ui/jquery.ui.spinner.js"></script>
16-
<link type="text/css" href="../demos.css" rel="stylesheet" />
17-
<script type="text/javascript">
18-
$(function() {
19-
$("#currency").change(function() {
20-
var current = $("#spinner").spinner("value");
21-
$.global.preferCulture($(this).val());
22-
$("#spinner").spinner("value", current);
23-
})
24-
25-
$("#spinner").spinner({
26-
min: 5,
27-
max: 2500,
28-
step: 25,
29-
start: 1000,
30-
numberFormat: "C"
31-
});
32-
33-
});
34-
</script>
35-
</head>
36-
<body>
37-
38-
<div class="demo">
39-
40-
<p>
41-
<label for="currency">Currency to donate</label>
42-
<select id="currency" name="currency">
43-
<option value="en-US">US $</option>
44-
<option value="de-DE">EUR €</option>
45-
<option value="ja-JP">YEN ¥</option>
46-
</select>
47-
</p>
48-
<p>
49-
<label for="spinner">Amount to donate:</label>
50-
<input id="spinner" name="spinner" value="5" />
51-
</p>
52-
</div>
53-
54-
<div class="demo-description">
55-
<p>
56-
Example of a donation form, with currency selection and amout spinner.
57-
</p>
58-
</div>
59-
60-
</body>
61-
</html>
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>jQuery UI Spinner - Default functionality</title>
6+
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7+
<script src="../../jquery-1.6.2.js"></script>
8+
<script src="../../external/jquery.mousewheel-3.0.4.js"></script>
9+
<script src="../../external/globalize.js"></script>
10+
<script src="../../external/globalize.culture.de-DE.js"></script>
11+
<script src="../../external/globalize.culture.ja-JP.js"></script>
12+
<script src="../../ui/jquery.ui.core.js"></script>
13+
<script src="../../ui/jquery.ui.widget.js"></script>
14+
<script src="../../ui/jquery.ui.button.js"></script>
15+
<script src="../../ui/jquery.ui.spinner.js"></script>
16+
<link rel="stylesheet" href="../demos.css">
17+
<script>
18+
$(function() {
19+
$( "#currency" ).change(function() {
20+
var current = $( "#spinner" ).spinner( "value" );
21+
Globalize.culture( $(this).val() );
22+
$( "#spinner" ).spinner( "value", current );
23+
});
24+
25+
$( "#spinner" ).spinner({
26+
min: 5,
27+
max: 2500,
28+
step: 25,
29+
start: 1000,
30+
numberFormat: "C"
31+
});
32+
});
33+
</script>
34+
</head>
35+
<body>
36+
37+
<div class="demo">
38+
39+
<p>
40+
<label for="currency">Currency to donate</label>
41+
<select id="currency" name="currency">
42+
<option value="en-US">US $</option>
43+
<option value="de-DE">EUR €</option>
44+
<option value="ja-JP">YEN ¥</option>
45+
</select>
46+
</p>
47+
<p>
48+
<label for="spinner">Amount to donate:</label>
49+
<input id="spinner" name="spinner" value="5">
50+
</p>
51+
52+
</div><!-- End demo -->
53+
54+
55+
56+
<div class="demo-description">
57+
<p>Example of a donation form, with currency selection and amout spinner.</p>
58+
</div><!-- End demo-description -->
59+
60+
</body>
61+
</html>

0 commit comments

Comments
 (0)