Skip to content

Commit 4d45e96

Browse files
taitemstaitems
committed
Merge branch '1-8-stable' of git://github.com/jquery/jquery-ui
2 parents 6c409eb + 6c7090a commit 4d45e96

Some content is hidden

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

60 files changed

+308
-157
lines changed

‎MIT-LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2010 Paul Bakaus, http://jqueryui.com/
1+
Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/
22

33
This software consists of voluntary contributions made by many
44
individuals (AUTHORS.txt, http://jqueryui.com/about) For exact

‎build/release/prepare-release‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ repo_dir="$base_dir/jquery-ui"
55
release_dir="$repo_dir/build/release"
66

77
github_repo="git@github.com:jquery/jquery-ui.git"
8-
remote_cmd="ssh jqadmin@ui-dev.jquery.com /srv/dev.jqueryui.com/prepare-release"
8+
git_branch="1-8-stable"
9+
trac_url="http://bugs.jqueryui.com"
910

1011

1112

@@ -25,6 +26,7 @@ cd $base_dir
2526
echo "Cloning repo from $github_repo..."
2627
git clone $github_repo
2728
cd $repo_dir
29+
git checkout $git_branch
2830

2931
echo
3032
echo "Environment setup complete."
@@ -43,11 +45,12 @@ echo "------------------------"
4345
echo
4446

4547
# NOTE: this will be different for minor and major releases
46-
version=`$remote_cmd/get-latest-version`
47-
major_minor=${version%.*}
48-
point=${version##*.}
49-
version_new="${major_minor}.$(($point + 1))"
50-
version_next=`cat version.txt`
48+
version_new=`cat version.txt`
49+
version_new=${version_new:0:$((${#version_new} - 3))}
50+
major_minor=${version_new%.*}
51+
point=${version_new##*.}
52+
version="${major_minor}.$(($point - 1))"
53+
version_next="${major_minor}.$(($point + 1))pre"
5154

5255
echo "We are going from $version to $version_new."
5356
echo "version.txt will be set to $version_next when complete."
@@ -85,7 +88,9 @@ git whatchanged $version... --pretty=format:"$format_full" \
8588

8689
# find all fixed tickets
8790
echo "Adding Trac tickets to changelog..."
88-
$remote_cmd/generate-changelog >> $base_dir/changelog
91+
trac_changelog="$trac_url/query?format=tab&milestone=$version_new"
92+
trac_changelog="$trac_changelog&resolution=fixed&col=id&col=component&col=summary&order=component"
93+
curl $trac_changelog >> $base_dir/changelog
8994

9095
echo
9196
echo "Changelog complete."
@@ -114,11 +119,11 @@ git whatchanged $version... --pretty=format:"$format_contributors" \
114119

115120
# find all reporters and commenters from Trac
116121
echo "Adding reporters and commenters from Trac..."
117-
$remote_cmd/generate-contributors >> $base_dir/thankyou
122+
curl "$trac_url/report/22?V=$version_new&max=-1&format=tab" | tail -n +2 >> $base_dir/thankyou
118123

119124
# sort names
120125
echo "Sorting contributors..."
121-
LC_ALL='C' sort -f $base_dir/thankyou | uniq > $base_dir/_thankyou
126+
LC_ALL='C' sort -f $base_dir/thankyou | col -b | uniq > $base_dir/_thankyou
122127
mv $base_dir/_thankyou $base_dir/thankyou
123128

124129
# find all people that were thanked
@@ -162,7 +167,7 @@ git tag $version_new
162167
echo "Updating version.txt to $version_next..."
163168
echo $version_next > version.txt
164169

165-
git commit -a -m "Updating the master version to $version_next"
170+
git commit -a -m "Updating the $git_branch version to $version_next"
166171
echo "Committed version.txt..."
167172

168173
echo
@@ -206,7 +211,6 @@ echo
206211

207212
# TODO: automate this
208213
# NOTE: this will be different for minor and major releases
209-
milestone=`$remote_cmd/get-latest-milestone`
210214

211215
# Create new milestrone and version
212216
echo "$version_new was tagged at $version_new_time."
@@ -215,11 +219,6 @@ echo "Create the $version_new Version with the above date and time."
215219
echo "Press enter when done."
216220
read
217221

218-
# Update milestone for all fixed tickets
219-
echo "Change all $milestone fixed tickets to $version_new."
220-
echo "Press enter when done."
221-
read
222-
223222
echo
224223
echo "Trac updates complete."
225224
echo

‎demos/datepicker/date-range.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
numberOfMonths: 3,
1818
onSelect: function( selectedDate ) {
1919
var option = this.id == "from" ? "minDate" : "maxDate",
20-
instance = $( this ).data( "datepicker" );
20+
instance = $( this ).data( "datepicker" ),
2121
date = $.datepicker.parseDate(
2222
instance.settings.dateFormat ||
2323
$.datepicker._defaults.dateFormat,

‎demos/datepicker/localization.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<script src="../../ui/jquery.ui.datepicker.js"></script>
1111
<script src="../../ui/i18n/jquery.ui.datepicker-af.js"></script>
1212
<script src="../../ui/i18n/jquery.ui.datepicker-ar.js"></script>
13+
<script src="../../ui/i18n/jquery.ui.datepicker-ar-DZ.js"></script>
1314
<script src="../../ui/i18n/jquery.ui.datepicker-az.js"></script>
1415
<script src="../../ui/i18n/jquery.ui.datepicker-bg.js"></script>
1516
<script src="../../ui/i18n/jquery.ui.datepicker-bs.js"></script>
@@ -18,7 +19,9 @@
1819
<script src="../../ui/i18n/jquery.ui.datepicker-da.js"></script>
1920
<script src="../../ui/i18n/jquery.ui.datepicker-de.js"></script>
2021
<script src="../../ui/i18n/jquery.ui.datepicker-el.js"></script>
22+
<script src="../../ui/i18n/jquery.ui.datepicker-en-AU.js"></script>
2123
<script src="../../ui/i18n/jquery.ui.datepicker-en-GB.js"></script>
24+
<script src="../../ui/i18n/jquery.ui.datepicker-en-NZ.js"></script>
2225
<script src="../../ui/i18n/jquery.ui.datepicker-eo.js"></script>
2326
<script src="../../ui/i18n/jquery.ui.datepicker-es.js"></script>
2427
<script src="../../ui/i18n/jquery.ui.datepicker-et.js"></script>
@@ -41,12 +44,14 @@
4144
<script src="../../ui/i18n/jquery.ui.datepicker-kz.js"></script>
4245
<script src="../../ui/i18n/jquery.ui.datepicker-lt.js"></script>
4346
<script src="../../ui/i18n/jquery.ui.datepicker-lv.js"></script>
47+
<script src="../../ui/i18n/jquery.ui.datepicker-ml.js"></script>
4448
<script src="../../ui/i18n/jquery.ui.datepicker-ms.js"></script>
4549
<script src="../../ui/i18n/jquery.ui.datepicker-nl.js"></script>
4650
<script src="../../ui/i18n/jquery.ui.datepicker-no.js"></script>
4751
<script src="../../ui/i18n/jquery.ui.datepicker-pl.js"></script>
4852
<script src="../../ui/i18n/jquery.ui.datepicker-pt.js"></script>
4953
<script src="../../ui/i18n/jquery.ui.datepicker-pt-BR.js"></script>
54+
<script src="../../ui/i18n/jquery.ui.datepicker-rm.js"></script>
5055
<script src="../../ui/i18n/jquery.ui.datepicker-ro.js"></script>
5156
<script src="../../ui/i18n/jquery.ui.datepicker-ru.js"></script>
5257
<script src="../../ui/i18n/jquery.ui.datepicker-sk.js"></script>
@@ -83,6 +88,7 @@
8388
<select id="locale">
8489
<option value="af">Afrikaans</option>
8590
<option value="sq">Albanian (Gjuha shqipe)</option>
91+
<option value="ar-DZ">Algerian Arabic</option>
8692
<option value="ar">Arabic (&#8235;(&#1604;&#1593;&#1585;&#1576;&#1610;</option>
8793
<option value="hy">Armenian (&#1344;&#1377;&#1397;&#1381;&#1408;&#1381;&#1398;)</option>
8894
<option value="az">Azerbaijani (Az&#601;rbaycan dili)</option>
@@ -97,6 +103,8 @@
97103
<option value="cs">Czech (&#269;e&#353;tina)</option>
98104
<option value="da">Danish (Dansk)</option>
99105
<option value="nl">Dutch (Nederlands)</option>
106+
<option value="en-AU">English/Australia</option>
107+
<option value="en-NZ">English/New Zealand</option>
100108
<option value="en-GB">English/UK</option>
101109
<option value="eo">Esperanto</option>
102110
<option value="et">Estonian (eesti keel)</option>
@@ -118,11 +126,13 @@
118126
<option value="kz">Kazakhstan (Kazakh)</option>
119127
<option value="lv">Latvian (Latvie&ouml;u Valoda)</option>
120128
<option value="lt">Lithuanian (lietuviu kalba)</option>
129+
<option value="ml">Malayalam</option>
121130
<option value="ms">Malaysian (Bahasa Malaysia)</option>
122131
<option value="no">Norwegian (Norsk)</option>
123132
<option value="pl">Polish (Polski)</option>
124133
<option value="pt">Portuguese (Portugu&ecirc;s)</option>
125134
<option value="pt-BR">Portuguese/Brazilian (Portugu&ecirc;s)</option>
135+
<option value="rm">Rhaeto-Romanic (Romansh)</option>
126136
<option value="ro">Romanian (Rom&acirc;n&#259;)</option>
127137
<option value="ru">Russian (&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;)</option>
128138
<option value="sr">Serbian (&#1089;&#1088;&#1087;&#1089;&#1082;&#1080; &#1112;&#1077;&#1079;&#1080;&#1082;)</option>

‎demos/index.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<script src="../ui/jquery.effects.transfer.js"></script>
4040
<script src="../ui/i18n/jquery.ui.datepicker-af.js"></script>
4141
<script src="../ui/i18n/jquery.ui.datepicker-ar.js"></script>
42+
<script src="../ui/i18n/jquery.ui.datepicker-ar-DZ.js"></script>
4243
<script src="../ui/i18n/jquery.ui.datepicker-az.js"></script>
4344
<script src="../ui/i18n/jquery.ui.datepicker-bs.js"></script>
4445
<script src="../ui/i18n/jquery.ui.datepicker-bg.js"></script>
@@ -47,7 +48,9 @@
4748
<script src="../ui/i18n/jquery.ui.datepicker-da.js"></script>
4849
<script src="../ui/i18n/jquery.ui.datepicker-de.js"></script>
4950
<script src="../ui/i18n/jquery.ui.datepicker-el.js"></script>
51+
<script src="../ui/i18n/jquery.ui.datepicker-en-AU.js"></script>
5052
<script src="../ui/i18n/jquery.ui.datepicker-en-GB.js"></script>
53+
<script src="../ui/i18n/jquery.ui.datepicker-en-NZ.js"></script>
5154
<script src="../ui/i18n/jquery.ui.datepicker-eo.js"></script>
5255
<script src="../ui/i18n/jquery.ui.datepicker-es.js"></script>
5356
<script src="../ui/i18n/jquery.ui.datepicker-et.js"></script>
@@ -70,12 +73,14 @@
7073
<script src="../ui/i18n/jquery.ui.datepicker-kz.js"></script>
7174
<script src="../ui/i18n/jquery.ui.datepicker-lt.js"></script>
7275
<script src="../ui/i18n/jquery.ui.datepicker-lv.js"></script>
76+
<script src="../ui/i18n/jquery.ui.datepicker-ml.js"></script>
7377
<script src="../ui/i18n/jquery.ui.datepicker-ms.js"></script>
7478
<script src="../ui/i18n/jquery.ui.datepicker-nl.js"></script>
7579
<script src="../ui/i18n/jquery.ui.datepicker-no.js"></script>
7680
<script src="../ui/i18n/jquery.ui.datepicker-pl.js"></script>
7781
<script src="../ui/i18n/jquery.ui.datepicker-pt.js"></script>
7882
<script src="../ui/i18n/jquery.ui.datepicker-pt-BR.js"></script>
83+
<script src="../ui/i18n/jquery.ui.datepicker-rm.js"></script>
7984
<script src="../ui/i18n/jquery.ui.datepicker-ro.js"></script>
8085
<script src="../ui/i18n/jquery.ui.datepicker-ru.js"></script>
8186
<script src="../ui/i18n/jquery.ui.datepicker-sk.js"></script>

‎tests/jquery.simulate.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* jquery.simulate - simulate browser mouse and keyboard events
33
*
4-
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
4+
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
55
* Dual licensed under the MIT or GPL Version 2 licenses.
66
* http://jquery.org/license
77
*

‎tests/unit/datepicker/datepicker_core.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ module("datepicker: core", {
4747
}
4848
});
4949

50+
test( "widget method - empty collection", function() {
51+
$( "#nonExist" ).datepicker(); // should create nothing
52+
ok( !$( "#ui-datepicker-div" ).length, "Non init on empty collection" );
53+
});
54+
5055
test("widget method", function() {
5156
var actual = $("#inp").datepicker().datepicker("widget")[0];
5257
same($("body > #ui-datepicker-div:last-child")[0], actual);

‎tests/unit/datepicker/datepicker_options.js‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -796,16 +796,21 @@ test('parseDate', function() {
796796
equalsDate($.datepicker.parseDate('\'day\' d \'of\' MM (\'\'DD\'\'), yy',
797797
'day 3 of February (\'Saturday\'), 2001'), new Date(2001, 2 - 1, 3),
798798
'Parse date \'day\' d \'of\' MM (\'\'DD\'\'), yy');
799-
equalsDate($.datepicker.parseDate('ymmdd', '010203'),
800-
new Date(2001, 2 - 1, 3), 'Parse date ymmdd - default cutoff');
801-
equalsDate($.datepicker.parseDate('y-m-d', '01-02-03'),
802-
new Date(2001, 2 - 1, 3), 'Parse date y-m-d - default cutoff');
803-
equalsDate($.datepicker.parseDate('y-m-d', '51-02-03'),
804-
new Date(1951, 2 - 1, 3), 'Parse date y-m-d - default cutoff');
805-
equalsDate($.datepicker.parseDate('y-m-d', '51-02-03', {shortYearCutoff: 80}),
806-
new Date(2051, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
807-
equalsDate($.datepicker.parseDate('y-m-d', '51-02-03', {shortYearCutoff: '+60'}),
808-
new Date(2051, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
799+
var currentYear = new Date().getFullYear();
800+
equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000) + '-02-03'),
801+
new Date(currentYear, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
802+
equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 10) + '-02-03'),
803+
new Date(currentYear+10, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
804+
equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 11) + '-02-03'),
805+
new Date(currentYear-89, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
806+
equalsDate($.datepicker.parseDate('y-m-d', '80-02-03', {shortYearCutoff: 80}),
807+
new Date(2080, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
808+
equalsDate($.datepicker.parseDate('y-m-d', '81-02-03', {shortYearCutoff: 80}),
809+
new Date(1981, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
810+
equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 60) + '-02-03', {shortYearCutoff: '+60'}),
811+
new Date(currentYear + 60, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
812+
equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 61) + '-02-03', {shortYearCutoff: '+60'}),
813+
new Date(currentYear - 39, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
809814
var gmtDate = new Date(2001, 2 - 1, 3);
810815
gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
811816
equalsDate($.datepicker.parseDate('@', '981158400000'), gmtDate, 'Parse date @');

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* jQuery UI Accordion @VERSION
33
*
4-
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
4+
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
55
* Dual licensed under the MIT or GPL Version 2 licenses.
66
* http://jquery.org/license
77
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* jQuery UI CSS Framework @VERSION
33
*
4-
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
4+
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
55
* Dual licensed under the MIT or GPL Version 2 licenses.
66
* http://jquery.org/license
77
*

0 commit comments

Comments
 (0)