Skip to content

Commit b7c53a4

Browse files
jzaeffererjzaefferer
committed
Merge branch 'master' into devpreview
2 parents e390dc4 + 9241757 commit b7c53a4

22 files changed

+298
-98
lines changed

‎build/build.xml

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<property name="ui.dir" value="../" />
2828
<property name="src.dir" value="${ui.dir}/ui/" />
2929
<property name="theme.dir" value="${ui.dir}/themes/base/" />
30-
<property name="docs.dir" value="${ui.dir}/docs/" />
30+
<property name="docs.dir" value="${dist.dir}/docs/" />
3131

3232
<property name="min.dir" value="${dist.dir}/ui/minified" />
3333

@@ -206,10 +206,6 @@
206206
<fileset dir="${ui.dir}/tests/" />
207207
</copy>
208208

209-
<copy overwrite="true" todir="${dist.dir}/docs/" >
210-
<fileset dir="${ui.dir}/docs/" />
211-
</copy>
212-
213209
<copy overwrite="true" todir="${dist.dir}/themes/" >
214210
<fileset dir="${ui.dir}/themes/" />
215211
</copy>
@@ -270,11 +266,43 @@
270266
<get src="http://docs.jquery.com/action/render/UI/Effects/Size" dest="${docs.dir}effect-size.html" />
271267
<get src="http://docs.jquery.com/action/render/UI/Effects/Transfer" dest="${docs.dir}effect-transfer.html" />
272268
</target>
273-
269+
274270
<target name="docs-clean">
275271
<delete dir="${docs.dir}" />
276272
</target>
277273

274+
<target name="themes-download">
275+
<!-- to create/update query strings for the theme-file, execute this in Firebug on /download page:
276+
$("select option[value!=none]").map(function() { $(this).parent().val(this.value).change(); return $(this).parents("form").serialize(); }).get().join(",");
277+
-->
278+
<loadfile srcFile="themes" property="urls" />
279+
<property name="zip" value="${dist.dir}themes/tmp.zip" />
280+
<mkdir dir="${dist.dir}themes" />
281+
<for list="${urls}" param="url">
282+
<sequential>
283+
<get src="http://ui-dev.jquery.com/download/?@{url}" dest="${zip}" />
284+
<unzip src="${zip}"
285+
dest="${dist.dir}themes/">
286+
<patternset>
287+
<include name="development-bundle/themes/**"/>
288+
<exclude name="development-bundle/themes/base/**"/>
289+
</patternset>
290+
<mapper type="glob" from="development-bundle/themes/*" to="*" />
291+
</unzip>
292+
<delete file="${zip}" />
293+
</sequential>
294+
</for>
295+
<move todir="${dist.dir}themes/">
296+
<fileset dir="${dist.dir}themes/" />
297+
<mapper>
298+
<mapper type="regexp" from="(.*)jquery-ui-.*custom.css" to="\1jquery-ui.css" />
299+
</mapper>
300+
</move>
301+
<zip destfile="${dist.dir}/../${release.filename}-themes.zip">
302+
<zipfileset dir="${dist.dir}/" includes="AUTHORS.txt,GPL-LICENSE.txt,MIT-LICENSE.txt,version.txt,themes/**" />
303+
</zip>
304+
</target>
305+
278306
<target name="whitespace">
279307
<replaceregexp match="[\t ]+$" replace="" flags="g" byline="true">
280308
<fileset dir="${src.dir}" includes="*.js"/>

‎build/themes

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎demos/dialog/modal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

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

56-
<p>A modal dialog prevents the user from interacting with the rest of the page until it is closed. To add a semi-transparent layer that dims out the page content behind the dialog, set the background color and opacity of the <code>overlay</code> option.</p>
56+
<p>A modal dialog prevents the user from interacting with the rest of the page until it is closed.</p>
5757

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

‎tests/static/button/default.html

Lines changed: 56 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,34 @@ <h2>Using button elements</h2>
2323
</button>
2424

2525
<button class="ui-button ui-button-icon-only ui-widget ui-state-default ui-corner-all" title="Button">
26-
<span class="ui-button-icon-primary ui-icon ui-icon-locked"></span>
27-
<span class="ui-button-text">Button</span>
26+
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
27+
<span class="ui-button-text">Primary icon</span>
2828
</button>
29-
30-
<button class="ui-button ui-button-text-icon ui-widget ui-state-default ui-corner-all">
31-
<span class="ui-button-icon-primary ui-icon ui-icon-locked"></span>
32-
<span class="ui-button-text">Button</span>
29+
30+
<button class="ui-button ui-button-icon-only ui-widget ui-state-default ui-corner-all" title="Button">
31+
<span class="ui-button-text">Secondary icon</span>
32+
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
33+
</button>
34+
35+
<button class="ui-button ui-button-text-icon-primary ui-widget ui-state-default ui-corner-all">
36+
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
37+
<span class="ui-button-text">Primary icon</span>
38+
</button>
39+
40+
<button class="ui-button ui-button-text-icon-secondary ui-widget ui-state-default ui-corner-all">
41+
<span class="ui-button-text">Secondary icon</span>
42+
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
3343
</button>
3444

3545
<button class="ui-button ui-button-text-icons ui-widget ui-state-default ui-corner-all">
3646
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
37-
<span class="ui-button-text">Button</span>
47+
<span class="ui-button-text">Both icons</span>
3848
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
3949
</button>
4050

4151
<button class="ui-button ui-button-icons-only ui-widget ui-state-default ui-corner-all">
4252
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
43-
<span class="ui-button-text">Button</span>
53+
<span class="ui-button-text">No text</span>
4454
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
4555
</button>
4656
</div>
@@ -53,24 +63,34 @@ <h2>Using anchor elements</h2>
5363
</a>
5464

5565
<a href="#" class="ui-button ui-button-icon-only ui-widget ui-state-default ui-corner-all" title="Button">
56-
<span class="ui-button-icon-primary ui-icon ui-icon-locked"></span>
57-
<span class="ui-button-text">Button</span>
66+
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
67+
<span class="ui-button-text">Primary icon</span>
5868
</a>
5969

60-
<a href="#" class="ui-button ui-button-text-icon ui-widget ui-state-default ui-corner-all">
61-
<span class="ui-button-icon-primary ui-icon ui-icon-locked"></span>
62-
<span class="ui-button-text">Button</span>
70+
<a href="#" class="ui-button ui-button-icon-only ui-widget ui-state-default ui-corner-all" title="Button">
71+
<span class="ui-button-text">Secondary icon</span>
72+
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
73+
</a>
74+
75+
<a href="#" class="ui-button ui-button-text-icon-primary ui-widget ui-state-default ui-corner-all">
76+
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
77+
<span class="ui-button-text">Primary icon</span>
78+
</a>
79+
80+
<a href="#" class="ui-button ui-button-text-icon-secondary ui-widget ui-state-default ui-corner-all">
81+
<span class="ui-button-text">Secondary icon</span>
82+
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
6383
</a>
6484

6585
<a href="#" class="ui-button ui-button-text-icons ui-widget ui-state-default ui-corner-all">
6686
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
67-
<span class="ui-button-text">Button</span>
87+
<span class="ui-button-text">Both icons</span>
6888
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
6989
</a>
7090

7191
<a href="#" class="ui-button ui-button-icons-only ui-widget ui-state-default ui-corner-all">
7292
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
73-
<span class="ui-button-text">Button</span>
93+
<span class="ui-button-text">No text</span>
7494
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
7595
</a>
7696
</div>
@@ -85,24 +105,34 @@ <h2>Using label elements (used when proxying to radio or check inputs)</h2>
85105
</label>
86106

87107
<label class="ui-button ui-button-icon-only ui-widget ui-state-default ui-corner-all" title="Button">
88-
<span class="ui-button-icon-primary ui-icon ui-icon-locked"></span>
89-
<span class="ui-button-text">Button</span>
108+
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
109+
<span class="ui-button-text">Primary icon</span>
90110
</label>
91111

92-
<label class="ui-button ui-button-text-icon ui-widget ui-state-default ui-corner-all">
93-
<span class="ui-button-icon-primary ui-icon ui-icon-locked"></span>
94-
<span class="ui-button-text">Button</span>
112+
<label class="ui-button ui-button-icon-only ui-widget ui-state-default ui-corner-all" title="Button">
113+
<span class="ui-button-text">Secondary icon</span>
114+
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
115+
</label>
116+
117+
<label class="ui-button ui-button-text-icon-primary ui-widget ui-state-default ui-corner-all">
118+
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
119+
<span class="ui-button-text">Primary icon</span>
120+
</label>
121+
122+
<label class="ui-button ui-button-text-icon-secondary ui-widget ui-state-default ui-corner-all">
123+
<span class="ui-button-text">Secondary icon</span>
124+
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
95125
</label>
96126

97127
<label class="ui-button ui-button-text-icons ui-widget ui-state-default ui-corner-all">
98128
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
99-
<span class="ui-button-text">Button</span>
129+
<span class="ui-button-text">Both icons</span>
100130
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
101131
</label>
102132

103133
<label class="ui-button ui-button-icons-only ui-widget ui-state-default ui-corner-all">
104134
<span class="ui-button-icon-primary ui-icon ui-icon-gear"></span>
105-
<span class="ui-button-text">Button</span>
135+
<span class="ui-button-text">No text</span>
106136
<span class="ui-button-icon-secondary ui-icon ui-icon-triangle-1-s"></span>
107137
</label>
108138
</div>
@@ -111,9 +141,10 @@ <h2>Using label elements (used when proxying to radio or check inputs)</h2>
111141
<h2>Button Sets</h2>
112142

113143
<div class="ui-buttonset">
114-
<button class="ui-button ui-button-text-only ui-widget ui-state-default ui-corner-left"><span class="ui-button-text">Simple button</span></button>
115-
<button class="ui-button ui-button-text-only ui-widget ui-state-default"><span class="ui-button-text">Simple button</span></button>
116-
<button class="ui-button ui-button-text-only ui-widget ui-state-default ui-corner-right"><span class="ui-button-text">Simple button</span></button>
144+
<button class="ui-button ui-button-text-only ui-widget ui-state-default ui-corner-left"><span class="ui-button-text">First</span></button>
145+
<button class="ui-button ui-button-text-only ui-widget ui-state-default"><span class="ui-button-text">Middle</span></button>
146+
<button class="ui-button ui-button-text-only ui-widget ui-state-default"><span class="ui-button-text">Middle</span></button>
147+
<button class="ui-button ui-button-text-only ui-widget ui-state-default ui-corner-right"><span class="ui-button-text">Last</span></button>
117148
</div>
118149

119150

‎tests/unit/tabs/tabs_tickets.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,16 @@ test('#4033 - IE expands hash to full url and misinterprets tab as ajax', functi
5959

6060
});
6161

62+
test('#5069 - ui.tabs.add creates two tab panels when using a full URL', function() {
63+
// http://dev.jqueryui.com/ticket/5069
64+
expect(2);
65+
66+
el = $('#tabs2').tabs();
67+
equals(el.children('div').length, el.find('> ul > li').length, 'After creation, number of panels should be equal to number of tabs');
68+
el.tabs('add', '/ajax_html_echo', 'Test');
69+
equals(el.children('div').length, el.find('> ul > li').length, 'After add, number of panels should be equal to number of tabs');
70+
71+
});
72+
6273

6374
})(jQuery);

‎tests/visual/autocomplete/autocomplete.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@
4040
close: function() {
4141
log("Hiding suggestions");
4242
},
43+
select: function(event, ui) {
44+
log("Selected: " + ui.item.value);
45+
},
4346
change: function(event, ui) {
44-
log(ui.item ? ("Selected: " + ui.item.value) : "Nothing selected, input was " + this.value);
47+
log(ui.item ? ("Changed to: " + ui.item.value) : "Nothing selected, input was " + this.value);
4548
}
4649
});
4750
}

‎tests/visual/button/button.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@
5858
<div>
5959
With icon
6060
<button class="{button:{icons:{primary:'ui-icon-locked'},text:false}}">Button with icon only</button>
61-
<button class="{button:{icons:{primary:'ui-icon-locked'}}}">Button with icon on the left</button>
62-
<button class="{button:{icons:{primary:'ui-icon-gear',secondary:'ui-icon-triangle-1-s'}}}">Button with two icons</button>
63-
<button class="{button:{icons:{primary:'ui-icon-gear',secondary:'ui-icon-triangle-1-s'},text:false}}">Button with two icons</button>
61+
<button class="{button:{icons:{primary:'ui-icon-locked'}}}">Primary icon</button>
62+
<button class="{button:{icons:{secondary:'ui-icon-triangle-1-s'}}}">Secondary icon</button>
63+
<button class="{button:{icons:{primary:'ui-icon-gear',secondary:'ui-icon-triangle-1-s'}}}">Both icons</button>
64+
<button class="{button:{icons:{primary:'ui-icon-gear',secondary:'ui-icon-triangle-1-s'},text:false}}">Button with two icons and no text</button>
6465
</div>
6566
</div>
6667

‎tests/visual/datepicker/datepicker_ticket_5676.html

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<title>Datepicker Visual Test : Datepicker ticket #5676</title>
6+
<link href="../visual.css" type="text/css" rel="stylesheet" />
7+
<link href="../../../themes/base/jquery.ui.all.css" type="text/css" rel="stylesheet">
8+
<script src="../../../jquery-1.4.2.js"></script>
9+
<script src="../../../ui/jquery.ui.core.js"></script>
10+
<script src="../../../ui/jquery.ui.widget.js"></script>
11+
<script src="../../../ui/jquery.ui.datepicker.js"></script>
12+
<script>
13+
$(function() {
14+
15+
$('.datepicker').datepicker({
16+
defaultDate: +7
17+
}).focus();
18+
19+
});
20+
</script>
21+
</head>
22+
<body>
23+
24+
<h1 class="ui-widget-header"><a href="http://dev.jqueryui.com/ticket/5676">#5676 - DatePicker Dialog defaultDate incorrect behaviour</a></h1>
25+
26+
<div class="datepicker"></div>
27+
<input class="datepicker" />
28+
29+
</body>
30+
</html>

‎tests/visual/resizable/resizable_ticket_5335.html

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<title>Resizable Visual Test : Resizable ticket #5335</title>
6+
<link rel="stylesheet" href="../visual.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.mouse.js"></script>
12+
<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
13+
<script type="text/javascript" src="../../../ui/jquery.ui.droppable.js"></script>
14+
<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
15+
<script type="text/javascript">
16+
$(function() {
17+
$('.item.to-be-draggable').draggable({ revert: true });
18+
$('.item').resizable({ maxWidth: 500, minHeight: 150, minWidth: 170, maxHeight: 400,handles: 'n,s' });
19+
}
20+
);
21+
</script>
22+
<style type="text/css">
23+
#main {
24+
width: 900px;
25+
height: 500px;
26+
overflow: scroll;
27+
}
28+
.item {
29+
width: 170px;
30+
height: 150px;
31+
margin: 10px;
32+
border: 1px solid #aaa;
33+
}
34+
#sub {
35+
height: 2000px;
36+
}
37+
.i1 { background-color: #acacac; }
38+
.i2 { background-color: #bcacac; }
39+
40+
</style>
41+
</head>
42+
<body>
43+
<h1 class="ui-widget-header"><a href="http://dev.jqueryui.com/ticket/5335">#5335 - Resizable: position set to absolute at end of resize</a></h1>
44+
<div id="main">
45+
<div id="sub">
46+
<div class="item i1 to-be-draggable">Draggable</div>
47+
<div class="item i2">Not draggable</div>
48+
</div>
49+
50+
</div>
51+
</body>
52+
</html>

‎themes/base/jquery.ui.base.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
@import url("jquery.ui.dialog.css");
88
@import url("jquery.ui.progressbar.css");
99
@import url("jquery.ui.resizable.css");
10+
@import url("jquery.ui.selectable.css");
1011
@import url("jquery.ui.slider.css");
1112
@import url("jquery.ui.tabs.css");
1213
@import url("jquery.ui.tooltip.css");

‎themes/base/jquery.ui.button.css

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ button.ui-button-icons-only { width: 3.7em; }
1111
.ui-button .ui-button-text { display: block; line-height: 1.4; }
1212
.ui-button-text-only .ui-button-text { padding: .4em 1em; }
1313
.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
14-
.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
14+
.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
15+
.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
1516
.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
1617
/* no icon support for input elements, provide padding by default */
1718
input.ui-button { padding: .4em 1em; }
1819

1920
/*button icon element(s) */
20-
.ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
21+
.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
2122
.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
22-
.ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
23+
.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
24+
.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
2325
.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
2426

2527
/*button sets*/
@@ -28,8 +30,3 @@ input.ui-button { padding: .4em 1em; }
2830

2931
/* workarounds */
3032
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
31-
32-
33-
34-
35-

‎themes/base/jquery.ui.selectable.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/* Selectable
2+
----------------------------------*/
3+
.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }

‎ui/i18n/jquery.ui.datepicker-pl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jQuery(function($){
1414
dayNamesShort: ['Nie','Pn','Wt','Śr','Czw','Pt','So'],
1515
dayNamesMin: ['N','Pn','Wt','Śr','Cz','Pt','So'],
1616
weekHeader: 'Tydz',
17-
dateFormat: 'yy-mm-dd',
17+
dateFormat: 'dd.mm.yy',
1818
firstDay: 1,
1919
isRTL: false,
2020
showMonthAfterYear: false,

0 commit comments

Comments
 (0)