Skip to content

Commit 7e79eee

Browse files
scottgonzalezscottgonzalez
committed
Merge branch 'master' of github.com:jquery/jquery-ui
2 parents 596d1ef + eeda4ea commit 7e79eee

33 files changed

+268
-615
lines changed

‎.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
build/dist
2+
docs
3+
.project
4+
*~
5+
*.diff
6+
*.patch
7+
.DS_Store

‎AUTHORS.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
jQuery UI Authors (http://ui.jquery.com/about)
1+
jQuery UI Authors (http://jqueryui.com/about)
22

33
This software consists of voluntary contributions made by many
44
individuals. For exact contribution history, see the revision history
5-
and logs, available at http://jquery-ui.googlecode.com/svn/
5+
and logs, available at http://github.com/jquery/jquery-ui
66

77
Brandon Aaron
88
Paul Bakaus (paulbakaus.com)

‎README.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[jQuery UI](http://jqueryui.com/) - Interactions and Widgets for the web
2+
================================
3+
4+
jQuery UI provides interactions like Drag and Drop and widgets like Autocomplete, Tabs and Slider and makes these as easy to use as jQuery itself.
5+
6+
If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get started. Or visit the [Using jQuery UI Forum](http://forum.jquery.com/using-jquery-ui) for discussions and questions.
7+
8+
If you are interested in helping developing jQuery UI, you are in the right place.
9+
To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui).

‎demos/autocomplete/combobox.html

+5-8
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
<script type="text/javascript" src="../../ui/jquery.ui.autocomplete.js"></script>
1313
<link type="text/css" href="../demos.css" rel="stylesheet" />
1414
<style type="text/css">
15-
.ui-autocomplete-input {
16-
margin: 0;
17-
}
15+
/* TODO shouldn't be necessary */
16+
.ui-button { margin-left: -1px; }
17+
.ui-button-icon-only .ui-button-text { padding: 0.35em; }
18+
.ui-autocomplete-input { margin: 0; padding: 0.48em 0 0.47em 0.45em; }
1819
</style>
1920
<script type="text/javascript">
2021
(function($) {
@@ -55,6 +56,7 @@
5556
})
5657
.addClass("ui-widget ui-widget-content ui-corner-left");
5758
$("<button>&nbsp;</button>")
59+
.attr("title", "Show All Items")
5860
.insertAfter(input)
5961
.button({
6062
icons: {
@@ -82,11 +84,6 @@
8284
$("select").combobox();
8385
});
8486
</script>
85-
<style>
86-
/* TODO shouldn't be necessary */
87-
.ui-button-icon-only .ui-button-text { padding: 0.35em; }
88-
.ui-autocomplete-input { padding: 0.48em 0 0.47em 0.45em; }
89-
</style>
9087
</head>
9188
<body>
9289

‎tests/visual/accordion/accordion.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<title>Accordion Visual Test : Accordion</title>
5+
<title>Accordion Visual Test : Default</title>
66
<link rel="stylesheet" href="../visual.css" type="text/css" />
77
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css">
88
<script type="text/javascript" src="../../../jquery-1.4.2.js"></script>

‎tests/visual/accordion/default.html

-36
This file was deleted.

‎tests/visual/autocomplete/default.html renamed to ‎tests/visual/autocomplete/autocomplete.html

File renamed without changes.

‎tests/visual/button/default.html renamed to ‎tests/visual/button/button.html

File renamed without changes.

‎tests/visual/datepicker/datepicker.html

+4-94
Original file line numberDiff line numberDiff line change
@@ -2,112 +2,22 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<title>Simple Datepicker</title>
6-
<link rel="stylesheet" href="../all.css" type="text/css">
5+
<title>Datepicker Visual Test : Default</title>
6+
<link rel="stylesheet" href="../visual.css" type="text/css" />
77
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css">
88
<script type="text/javascript" src="../../../jquery-1.4.2.js"></script>
99
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
1010
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
1111
<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
1212
<script type="text/javascript">
1313
$(function() {
14-
// simple datepicker
15-
$('#d1').datepicker();
16-
$('button.disable-d1').click(function(event){
17-
$('#d1').datepicker('disable');
18-
event.preventDefault();
19-
});
20-
$('button.enable-d1').click(function(event){
21-
$('#d1').datepicker('enable');
22-
event.preventDefault();
23-
});
24-
$('button.destroy-d1').click(function(event){
25-
$('#d1').datepicker('destroy');
26-
event.preventDefault();
27-
});
28-
29-
// multi datepicker
30-
$('#d2').datepicker({numberOfMonths: 3, showButtonPanel: true});
31-
$('button.disable-d2').click(function(event){
32-
$('#d2').datepicker('disable');
33-
event.preventDefault();
34-
});
35-
$('button.enable-d2').click(function(event){
36-
$('#d2').datepicker('enable');
37-
event.preventDefault();
38-
});
39-
$('button.destroy-d2').click(function(event){
40-
$('#d2').datepicker('destroy');
41-
event.preventDefault();
42-
});
43-
44-
// inline datepicker
45-
$('#inl').datepicker({minDate: -20, maxDate: '+1M +10D'});
46-
$('button.disable-inl').click(function(event){
47-
$('#inl').datepicker('disable');
48-
event.preventDefault();
49-
});
50-
$('button.enable-inl').click(function(event){
51-
$('#inl').datepicker('enable');
52-
event.preventDefault();
53-
});
54-
$('button.destroy-inl').click(function(event){
55-
$('#inl').datepicker('destroy');
56-
event.preventDefault();
57-
});
58-
59-
// disabled input datepicker
60-
$('#d3').datepicker();
61-
62-
// bottom-right datepicker
63-
$('#d4').datepicker({numberOfMonths: 3});
14+
$('#datepicker').datepicker();
6415
});
6516
</script>
6617
</head>
6718
<body>
6819

69-
<ul class="plugins">
70-
<li class="plugin">
71-
<button class="disable-d1">Disable</button>
72-
<button class="enable-d1">Enable</button>
73-
<button class="destroy-d1">Destroy</button>
74-
75-
Datepicker Simple
76-
<div>
77-
<input type="text" id="d1" />
78-
</div>
79-
</li>
80-
<li class="plugin">
81-
<button class="disable-d2">Disable</button>
82-
<button class="enable-d2">Enable</button>
83-
<button class="destroy-d2">Destroy</button>
84-
85-
Datepicker Multi
86-
<div>
87-
<input type="text" id="d2" />
88-
</div>
89-
</li>
90-
<li class="plugin">
91-
<button class="disable-inl">Disable</button>
92-
<button class="enable-inl">Enable</button>
93-
<button class="destroy-inl">Destroy</button>
94-
95-
Datepicker Inline
96-
<div id="inl"></div>
97-
</li>
98-
<li class="plugin">
99-
Datepicker disabled input
100-
<div>
101-
<input type="text" id="d3" disabled="disabled" />
102-
</div>
103-
</li>
104-
<li class="plugin" style="position: absolute; right: 0; bottom: 0; height: 40px">
105-
Datepicker - positioned bottom-right
106-
<div>
107-
<input type="text" id="d4">
108-
</div>
109-
</li>
110-
</ul>
20+
<div id="datepicker"></div>
11121

11222
</body>
11323
</html>

‎tests/visual/datepicker/datepicker_multi_inline.html

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<title>Simple Datepicker</title>
6+
<link rel="stylesheet" href="../all.css" type="text/css">
7+
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css">
8+
<script type="text/javascript" src="../../../jquery-1.4.2.js"></script>
9+
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
10+
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
11+
<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
12+
<script type="text/javascript">
13+
$(function() {
14+
// simple datepicker
15+
$('#d1').datepicker();
16+
$('button.disable-d1').click(function(event){
17+
$('#d1').datepicker('disable');
18+
event.preventDefault();
19+
});
20+
$('button.enable-d1').click(function(event){
21+
$('#d1').datepicker('enable');
22+
event.preventDefault();
23+
});
24+
$('button.destroy-d1').click(function(event){
25+
$('#d1').datepicker('destroy');
26+
event.preventDefault();
27+
});
28+
29+
// multi datepicker
30+
$('#d2').datepicker({numberOfMonths: 3, showButtonPanel: true});
31+
$('button.disable-d2').click(function(event){
32+
$('#d2').datepicker('disable');
33+
event.preventDefault();
34+
});
35+
$('button.enable-d2').click(function(event){
36+
$('#d2').datepicker('enable');
37+
event.preventDefault();
38+
});
39+
$('button.destroy-d2').click(function(event){
40+
$('#d2').datepicker('destroy');
41+
event.preventDefault();
42+
});
43+
44+
// inline datepicker
45+
$('#inl').datepicker({minDate: -20, maxDate: '+1M +10D'});
46+
$('button.disable-inl').click(function(event){
47+
$('#inl').datepicker('disable');
48+
event.preventDefault();
49+
});
50+
$('button.enable-inl').click(function(event){
51+
$('#inl').datepicker('enable');
52+
event.preventDefault();
53+
});
54+
$('button.destroy-inl').click(function(event){
55+
$('#inl').datepicker('destroy');
56+
event.preventDefault();
57+
});
58+
59+
// disabled input datepicker
60+
$('#d3').datepicker();
61+
62+
// bottom-right datepicker
63+
$('#d4').datepicker({numberOfMonths: 3});
64+
});
65+
</script>
66+
</head>
67+
<body>
68+
69+
<ul class="plugins">
70+
<li class="plugin">
71+
<button class="disable-d1">Disable</button>
72+
<button class="enable-d1">Enable</button>
73+
<button class="destroy-d1">Destroy</button>
74+
75+
Datepicker Simple
76+
<div>
77+
<input type="text" id="d1" />
78+
</div>
79+
</li>
80+
<li class="plugin">
81+
<button class="disable-d2">Disable</button>
82+
<button class="enable-d2">Enable</button>
83+
<button class="destroy-d2">Destroy</button>
84+
85+
Datepicker Multi
86+
<div>
87+
<input type="text" id="d2" />
88+
</div>
89+
</li>
90+
<li class="plugin">
91+
<button class="disable-inl">Disable</button>
92+
<button class="enable-inl">Enable</button>
93+
<button class="destroy-inl">Destroy</button>
94+
95+
Datepicker Inline
96+
<div id="inl"></div>
97+
</li>
98+
<li class="plugin">
99+
Datepicker disabled input
100+
<div>
101+
<input type="text" id="d3" disabled="disabled" />
102+
</div>
103+
</li>
104+
<li class="plugin" style="position: absolute; right: 0; bottom: 0; height: 40px">
105+
Datepicker - positioned bottom-right
106+
<div>
107+
<input type="text" id="d4">
108+
</div>
109+
</li>
110+
</ul>
111+
112+
</body>
113+
</html>

‎tests/visual/datepicker/default.html

-23
This file was deleted.

‎tests/visual/dialog/default.html

-32
This file was deleted.

0 commit comments

Comments
 (0)