Skip to content

Commit a6499c0

Browse files
arschmitzarschmitz
committed
Datepicker: Style updates
Ref #14246 Ref gh-1588
1 parent 9ef84a6 commit a6499c0

File tree

4 files changed

+167
-159
lines changed

4 files changed

+167
-159
lines changed

‎tests/unit/datepicker/events.js

Lines changed: 123 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -4,151 +4,159 @@ define( [
44
"ui/widgets/datepicker"
55
], function( $, testHelper ) {
66

7-
module("datepicker: events");
7+
module( "datepicker: events" );
88

99
var selectedThis = null,
1010
selectedDate = null,
1111
selectedInst = null;
1212

13-
function callback(date, inst) {
13+
function callback( date, inst ) {
1414
selectedThis = this;
1515
selectedDate = date;
1616
selectedInst = inst;
1717
}
1818

19-
function callback2(year, month, inst) {
19+
function callback2( year, month, inst ) {
2020
selectedThis = this;
2121
selectedDate = year + "/" + month;
2222
selectedInst = inst;
2323
}
2424

25-
test("events", function() {
25+
test( "events", function() {
2626
expect( 26 );
2727
var dateStr, newMonthYear, inp2,
28-
inp = testHelper.init("#inp", {onSelect: callback}),
28+
inp = testHelper.init( "#inp", { onSelect: callback } ),
2929
date = new Date();
30+
3031
// onSelect
31-
inp.val("").datepicker("show").
32-
simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
33-
equal(selectedThis, inp[0], "Callback selected this");
34-
equal(selectedInst, $.data(inp[0], testHelper.PROP_NAME), "Callback selected inst");
35-
equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", date),
36-
"Callback selected date");
37-
inp.val("").datepicker("show").
38-
simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.DOWN}).
39-
simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
40-
date.setDate(date.getDate() + 7);
41-
equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", date),
42-
"Callback selected date - ctrl+down");
43-
inp.val("").datepicker("show").
44-
simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
45-
equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", date),
46-
"Callback selected date - esc");
32+
inp.val( "" ).datepicker( "show" ).
33+
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
34+
equal( selectedThis, inp[ 0 ], "Callback selected this" );
35+
equal( selectedInst, $.data( inp[ 0 ], testHelper.PROP_NAME ), "Callback selected inst" );
36+
equal( selectedDate, $.datepicker.formatDate( "mm/dd/yy", date ),
37+
"Callback selected date" );
38+
inp.val( "" ).datepicker( "show" ).
39+
simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.DOWN } ).
40+
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
41+
date.setDate( date.getDate() + 7 );
42+
equal( selectedDate, $.datepicker.formatDate( "mm/dd/yy", date ),
43+
"Callback selected date - ctrl+down" );
44+
inp.val( "" ).datepicker( "show" ).
45+
simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
46+
equal( selectedDate, $.datepicker.formatDate( "mm/dd/yy", date ),
47+
"Callback selected date - esc" );
4748
dateStr = "02/04/2008";
48-
inp.val(dateStr).datepicker("show").
49-
simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
50-
equal(dateStr, selectedDate,
51-
"onSelect is called after enter keydown");
49+
inp.val( dateStr ).datepicker( "show" ).
50+
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
51+
equal( dateStr, selectedDate,
52+
"onSelect is called after enter keydown" );
53+
5254
// onChangeMonthYear
53-
inp.datepicker("option", {onChangeMonthYear: callback2, onSelect: null}).
54-
val("").datepicker("show");
55-
newMonthYear = function(date) {
56-
return date.getFullYear() + "/" + (date.getMonth() + 1);
55+
inp.datepicker( "option", { onChangeMonthYear: callback2, onSelect: null } ).
56+
val( "" ).datepicker( "show" );
57+
newMonthYear = function( date ) {
58+
return date.getFullYear() + "/" + ( date.getMonth() + 1 );
5759
};
5860
date = new Date();
59-
date.setDate(1);
60-
inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP});
61-
date.setMonth(date.getMonth() - 1);
62-
equal(selectedThis, inp[0], "Callback change month/year this");
63-
equal(selectedInst, $.data(inp[0], testHelper.PROP_NAME), "Callback change month/year inst");
64-
equal(selectedDate, newMonthYear(date),
65-
"Callback change month/year date - pgup");
66-
inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN});
67-
date.setMonth(date.getMonth() + 1);
68-
equal(selectedDate, newMonthYear(date),
69-
"Callback change month/year date - pgdn");
70-
inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP});
71-
date.setFullYear(date.getFullYear() - 1);
72-
equal(selectedDate, newMonthYear(date),
73-
"Callback change month/year date - ctrl+pgup");
74-
inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME});
75-
date.setFullYear(date.getFullYear() + 1);
76-
equal(selectedDate, newMonthYear(date),
77-
"Callback change month/year date - ctrl+home");
78-
inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN});
79-
date.setFullYear(date.getFullYear() + 1);
80-
equal(selectedDate, newMonthYear(date),
81-
"Callback change month/year date - ctrl+pgdn");
82-
inp.datepicker("setDate", new Date(2007, 1 - 1, 26));
83-
equal(selectedDate, "2007/1", "Callback change month/year date - setDate");
61+
date.setDate( 1 );
62+
inp.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
63+
date.setMonth( date.getMonth() - 1 );
64+
equal( selectedThis, inp[ 0 ], "Callback change month/year this" );
65+
equal( selectedInst, $.data( inp[ 0 ], testHelper.PROP_NAME ), "Callback change month/year inst" );
66+
equal( selectedDate, newMonthYear( date ),
67+
"Callback change month/year date - pgup" );
68+
inp.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
69+
date.setMonth( date.getMonth() + 1 );
70+
equal( selectedDate, newMonthYear( date ),
71+
"Callback change month/year date - pgdn" );
72+
inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } );
73+
date.setFullYear( date.getFullYear() - 1 );
74+
equal( selectedDate, newMonthYear( date ),
75+
"Callback change month/year date - ctrl+pgup" );
76+
inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.HOME } );
77+
date.setFullYear( date.getFullYear() + 1 );
78+
equal( selectedDate, newMonthYear( date ),
79+
"Callback change month/year date - ctrl+home" );
80+
inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } );
81+
date.setFullYear( date.getFullYear() + 1 );
82+
equal( selectedDate, newMonthYear( date ),
83+
"Callback change month/year date - ctrl+pgdn" );
84+
inp.datepicker( "setDate", new Date( 2007, 1 - 1, 26 ) );
85+
equal( selectedDate, "2007/1", "Callback change month/year date - setDate" );
8486
selectedDate = null;
85-
inp.datepicker("setDate", new Date(2007, 1 - 1, 12));
86-
ok(selectedDate == null, "Callback change month/year date - setDate no change");
87+
inp.datepicker( "setDate", new Date( 2007, 1 - 1, 12 ) );
88+
ok( selectedDate == null, "Callback change month/year date - setDate no change" );
89+
8790
// onChangeMonthYear step by 2
88-
inp.datepicker("option", {stepMonths: 2}).
89-
datepicker("hide").val("").datepicker("show").
90-
simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP});
91-
date.setMonth(date.getMonth() - 14);
92-
equal(selectedDate, newMonthYear(date),
93-
"Callback change month/year by 2 date - pgup");
94-
inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP});
95-
date.setMonth(date.getMonth() - 12);
96-
equal(selectedDate, newMonthYear(date),
97-
"Callback change month/year by 2 date - ctrl+pgup");
98-
inp.simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN});
99-
date.setMonth(date.getMonth() + 2);
100-
equal(selectedDate, newMonthYear(date),
101-
"Callback change month/year by 2 date - pgdn");
102-
inp.simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN});
103-
date.setMonth(date.getMonth() + 12);
104-
equal(selectedDate, newMonthYear(date),
105-
"Callback change month/year by 2 date - ctrl+pgdn");
91+
inp.datepicker( "option", { stepMonths: 2 } ).
92+
datepicker( "hide" ).val( "" ).datepicker( "show" ).
93+
simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP } );
94+
date.setMonth( date.getMonth() - 14 );
95+
equal( selectedDate, newMonthYear( date ),
96+
"Callback change month/year by 2 date - pgup" );
97+
inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } );
98+
date.setMonth( date.getMonth() - 12 );
99+
equal( selectedDate, newMonthYear( date ),
100+
"Callback change month/year by 2 date - ctrl+pgup" );
101+
inp.simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN } );
102+
date.setMonth( date.getMonth() + 2 );
103+
equal( selectedDate, newMonthYear( date ),
104+
"Callback change month/year by 2 date - pgdn" );
105+
inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } );
106+
date.setMonth( date.getMonth() + 12 );
107+
equal( selectedDate, newMonthYear( date ),
108+
"Callback change month/year by 2 date - ctrl+pgdn" );
109+
106110
// onClose
107-
inp.datepicker("option", {onClose: callback, onChangeMonthYear: null, stepMonths: 1}).
108-
val("").datepicker("show").
109-
simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
110-
equal(selectedThis, inp[0], "Callback close this");
111-
equal(selectedInst, $.data(inp[0], testHelper.PROP_NAME), "Callback close inst");
112-
equal(selectedDate, "", "Callback close date - esc");
113-
inp.val("").datepicker("show").
114-
simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
115-
equal(selectedDate, $.datepicker.formatDate("mm/dd/yy", new Date()),
116-
"Callback close date - enter");
117-
inp.val("02/04/2008").datepicker("show").
118-
simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
119-
equal(selectedDate, "02/04/2008", "Callback close date - preset");
120-
inp.val("02/04/2008").datepicker("show").
121-
simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
122-
equal(selectedDate, "", "Callback close date - ctrl+end");
123-
124-
inp2 = testHelper.init("#inp2");
125-
inp2.datepicker().datepicker("option", {onClose: callback}).datepicker("show");
126-
inp.datepicker("show");
127-
equal(selectedThis, inp2[0], "Callback close this");
128-
});
129-
130-
test("beforeShowDay-getDate", function() {
111+
inp.datepicker( "option", { onClose: callback, onChangeMonthYear: null, stepMonths: 1 } ).
112+
val( "" ).datepicker( "show" ).
113+
simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
114+
equal( selectedThis, inp[ 0 ], "Callback close this" );
115+
equal( selectedInst, $.data( inp[ 0 ], testHelper.PROP_NAME ), "Callback close inst" );
116+
equal( selectedDate, "", "Callback close date - esc" );
117+
inp.val( "" ).datepicker( "show" ).
118+
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
119+
equal( selectedDate, $.datepicker.formatDate( "mm/dd/yy", new Date() ),
120+
"Callback close date - enter" );
121+
inp.val( "02/04/2008" ).datepicker( "show" ).
122+
simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
123+
equal( selectedDate, "02/04/2008", "Callback close date - preset" );
124+
inp.val( "02/04/2008" ).datepicker( "show" ).
125+
simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.END } );
126+
equal( selectedDate, "", "Callback close date - ctrl+end" );
127+
128+
inp2 = testHelper.init( "#inp2" );
129+
inp2.datepicker().datepicker( "option", { onClose: callback } ).datepicker( "show" );
130+
inp.datepicker( "show" );
131+
equal( selectedThis, inp2[ 0 ], "Callback close this" );
132+
} );
133+
134+
test( "beforeShowDay-getDate", function() {
131135
expect( 3 );
132-
var inp = testHelper.init("#inp", {beforeShowDay: function() { inp.datepicker("getDate"); return [true, ""]; }}),
133-
dp = $("#ui-datepicker-div");
134-
inp.val("01/01/2010").datepicker("show");
136+
var inp = testHelper.init( "#inp", { beforeShowDay: function() { inp.datepicker( "getDate" ); return [ true, "" ]; } } ),
137+
dp = $( "#ui-datepicker-div" );
138+
inp.val( "01/01/2010" ).datepicker( "show" );
139+
135140
// contains non-breaking space
136-
equal($("div.ui-datepicker-title").text(),
137-
// support: IE <9, jQuery <1.8
141+
equal( $( "div.ui-datepicker-title" ).text(),
142+
143+
// Support: IE <9, jQuery <1.8
138144
// In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
139-
$( "<span>January&#xa0;2010</span>" ).text(), "Initial month");
140-
$("a.ui-datepicker-next", dp).trigger( "click" );
141-
$("a.ui-datepicker-next", dp).trigger( "click" );
145+
$( "<span>January&#xa0;2010</span>" ).text(), "Initial month" );
146+
$( "a.ui-datepicker-next", dp ).trigger( "click" );
147+
$( "a.ui-datepicker-next", dp ).trigger( "click" );
148+
142149
// contains non-breaking space
143-
equal($("div.ui-datepicker-title").text(),
144-
$( "<span>March&#xa0;2010</span>" ).text(), "After next clicks");
145-
inp.datepicker("hide").datepicker("show");
146-
$("a.ui-datepicker-prev", dp).trigger( "click" );
147-
$("a.ui-datepicker-prev", dp).trigger( "click" );
150+
equal( $( "div.ui-datepicker-title" ).text(),
151+
$( "<span>March&#xa0;2010</span>" ).text(), "After next clicks" );
152+
inp.datepicker( "hide" ).datepicker( "show" );
153+
$( "a.ui-datepicker-prev", dp ).trigger( "click" );
154+
$( "a.ui-datepicker-prev", dp ).trigger( "click" );
155+
148156
// contains non-breaking space
149-
equal($("div.ui-datepicker-title").text(),
150-
$( "<span>November&#xa0;2009</span>" ).text(), "After prev clicks");
151-
inp.datepicker("hide");
152-
});
157+
equal( $( "div.ui-datepicker-title" ).text(),
158+
$( "<span>November&#xa0;2009</span>" ).text(), "After prev clicks" );
159+
inp.datepicker( "hide" );
160+
} );
153161

154162
} );

‎ui/i18n/datepicker-af.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
/* Afrikaans initialisation for the jQuery UI date picker plugin. */
22
/* Written by Renier Pretorius. */
3-
(function( factory ) {
3+
( function( factory ) {
44
if ( typeof define === "function" && define.amd ) {
55

66
// AMD. Register as an anonymous module.
7-
define([ "../widgets/datepicker" ], factory );
7+
define( [ "../widgets/datepicker" ], factory );
88
} else {
99

1010
// Browser globals
1111
factory( jQuery.datepicker );
1212
}
13-
}(function( datepicker ) {
13+
}( function( datepicker ) {
1414

15-
datepicker.regional['af'] = {
16-
closeText: 'Selekteer',
17-
prevText: 'Vorige',
18-
nextText: 'Volgende',
19-
currentText: 'Vandag',
20-
monthNames: ['Januarie','Februarie','Maart','April','Mei','Junie',
21-
'Julie','Augustus','September','Oktober','November','Desember'],
22-
monthNamesShort: ['Jan', 'Feb', 'Mrt', 'Apr', 'Mei', 'Jun',
23-
'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
24-
dayNames: ['Sondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag'],
25-
dayNamesShort: ['Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat'],
26-
dayNamesMin: ['So','Ma','Di','Wo','Do','Vr','Sa'],
15+
datepicker.regional[ "af" ] = {
16+
closeText: "Selekteer",
17+
prevText: "Vorige",
18+
nextText: "Volgende",
19+
currentText: "Vandag",
20+
monthNames: [ "Januarie","Februarie","Maart","April","Mei","Junie",
21+
"Julie","Augustus","September","Oktober","November","Desember" ],
22+
monthNamesShort: [ "Jan", "Feb", "Mrt", "Apr", "Mei", "Jun",
23+
"Jul", "Aug", "Sep", "Okt", "Nov", "Des" ],
24+
dayNames: [ "Sondag", "Maandag", "Dinsdag", 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag' ],
25+
dayNamesShort: [ 'Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat' ],
26+
dayNamesMin: [ 'So','Ma','Di','Wo','Do','Vr','Sa' ],
2727
weekHeader: 'Wk',
2828
dateFormat: 'dd/mm/yy',
2929
firstDay: 1,
3030
isRTL: false,
3131
showMonthAfterYear: false,
32-
yearSuffix: ''};
33-
datepicker.setDefaults(datepicker.regional['af']);
32+
yearSuffix: '' };
33+
datepicker.setDefaults( datepicker.regional[ 'af' ] );
3434

35-
return datepicker.regional['af'];
35+
return datepicker.regional[ 'af' ];
3636

37-
}));
37+
} ) );

‎ui/i18n/datepicker-ar-DZ.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
/* Algerian Arabic Translation for jQuery UI date picker plugin. (can be used for Tunisia)*/
22
/* Mohamed Cherif BOUCHELAGHEM -- cherifbouchelaghem@yahoo.fr */
33

4-
(function( factory ) {
4+
( function( factory ) {
55
if ( typeof define === "function" && define.amd ) {
66

77
// AMD. Register as an anonymous module.
8-
define([ "../widgets/datepicker" ], factory );
8+
define( [ "../widgets/datepicker" ], factory );
99
} else {
1010

1111
// Browser globals
1212
factory( jQuery.datepicker );
1313
}
14-
}(function( datepicker ) {
14+
}( function( datepicker ) {
1515

16-
datepicker.regional['ar-DZ'] = {
17-
closeText: 'إغلاق',
18-
prevText: '&#x3C;السابق',
19-
nextText: 'التالي&#x3E;',
20-
currentText: 'اليوم',
21-
monthNames: ['جانفي', 'فيفري', 'مارس', 'أفريل', 'ماي', 'جوان',
22-
'جويلية', 'أوت', 'سبتمبر','أكتوبر', 'نوفمبر', 'ديسمبر'],
23-
monthNamesShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
24-
dayNames: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
25-
dayNamesShort: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
26-
dayNamesMin: ['الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت'],
16+
datepicker.regional[ "ar-DZ" ] = {
17+
closeText: "إغلاق",
18+
prevText: "&#x3C;السابق",
19+
nextText: "التالي&#x3E;",
20+
currentText: "اليوم",
21+
monthNames: [ "جانفي", "فيفري", "مارس", "أفريل", "ماي", "جوان",
22+
"جويلية", "أوت", "سبتمبر","أكتوبر", "نوفمبر", "ديسمبر" ],
23+
monthNamesShort: [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", '12' ],
24+
dayNames: [ 'الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت' ],
25+
dayNamesShort: [ 'الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت' ],
26+
dayNamesMin: [ 'الأحد', 'الاثنين', 'الثلاثاء', 'الأربعاء', 'الخميس', 'الجمعة', 'السبت' ],
2727
weekHeader: 'أسبوع',
2828
dateFormat: 'dd/mm/yy',
2929
firstDay: 6,
3030
isRTL: true,
3131
showMonthAfterYear: false,
32-
yearSuffix: ''};
33-
datepicker.setDefaults(datepicker.regional['ar-DZ']);
32+
yearSuffix: '' };
33+
datepicker.setDefaults( datepicker.regional[ 'ar-DZ' ] );
3434

35-
return datepicker.regional['ar-DZ'];
35+
return datepicker.regional[ 'ar-DZ' ];
3636

37-
}));
37+
} ) );

0 commit comments

Comments
 (0)