@@ -3351,16 +3351,16 @@ function loadCultureFiles_mask(name: string, base?: boolean): void {
3351
3351
3352
3352
L10n . load ( {
3353
3353
'en' : {
3354
- 'MaskedDateTime ' : { day : 'day' , month : 'month' , year : 'year' , hour : 'hour' , minute : 'minute' , second :'second' }
3354
+ 'datetimepicker ' : { day : 'day' , month : 'month' , year : 'year' , hour : 'hour' , minute : 'minute' , second :'second' }
3355
3355
} ,
3356
3356
'de' : {
3357
- 'MaskedDateTime ' : { day : 'Tag' , month : 'Monat' , year : 'Jahr' , hour : 'Stunde' , minute : 'Minute' , second :'Sekunden' }
3357
+ 'datetimepicker ' : { day : 'Tag' , month : 'Monat' , year : 'Jahr' , hour : 'Stunde' , minute : 'Minute' , second :'Sekunden' }
3358
3358
} ,
3359
3359
'zh' : {
3360
- 'MaskedDateTime ' : { day : '日' , month : '月' , year : '年' , hour : '小時' , minute : '分鐘' , second :'第二' }
3360
+ 'datetimepicker ' : { day : '日' , month : '月' , year : '年' , hour : '小時' , minute : '分鐘' , second :'第二' }
3361
3361
} ,
3362
3362
'ja' : {
3363
- 'MaskedDateTime ' : { day : '日' , month : '月' , year : '年' , hour : '時間' , minute : '分' , second :'秒' }
3363
+ 'datetimepicker ' : { day : '日' , month : '月' , year : '年' , hour : '時間' , minute : '分' , second :'秒' }
3364
3364
} ,
3365
3365
} ) ;
3366
3366
@@ -3412,7 +3412,7 @@ describe('Datetimepicker', () => {
3412
3412
document . body . appendChild ( inputEle ) ;
3413
3413
datetimepicker = new DateTimePicker ( { enableMask : true } ) ;
3414
3414
datetimepicker . appendTo ( '#datetimepicker' ) ;
3415
- expect ( datetimepicker . element . value ) . toBe ( 'day/ month/year' ) ;
3415
+ expect ( datetimepicker . element . value ) . toBe ( 'month/day/ year hour:minute AM ' ) ;
3416
3416
expect ( datetimepicker . value ) . toBe ( null ) ;
3417
3417
} ) ;
3418
3418
it ( 'Rendering with maskPlaceholder as custom type ' , ( ) => {
@@ -3426,25 +3426,25 @@ describe('Datetimepicker', () => {
3426
3426
it ( 'With format property ' , ( ) => {
3427
3427
let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
3428
3428
document . body . appendChild ( inputEle ) ;
3429
- datetimepicker = new DateTimePicker ( { enableMask : true , format : 'd:M:yyyy dddd ' } ) ;
3429
+ datetimepicker = new DateTimePicker ( { enableMask : true , format : 'd:M:yyyy E ' } ) ;
3430
3430
datetimepicker . appendTo ( '#datetimepicker' ) ;
3431
3431
expect ( datetimepicker . element . value ) . toBe ( 'day:month:year day of the week' ) ;
3432
3432
expect ( datetimepicker . value ) . toBe ( null ) ;
3433
3433
} ) ;
3434
3434
it ( 'With format property -1 ' , ( ) => {
3435
3435
let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
3436
3436
document . body . appendChild ( inputEle ) ;
3437
- datetimepicker = new DateTimePicker ( { enableMask : true , format : 'MM yyyy' } ) ;
3437
+ datetimepicker = new DateTimePicker ( { enableMask : true , format : 'MM yyyy EEEE ' } ) ;
3438
3438
datetimepicker . appendTo ( '#datetimepicker' ) ;
3439
- expect ( datetimepicker . element . value ) . toBe ( 'month year' ) ;
3439
+ expect ( datetimepicker . element . value ) . toBe ( 'month year day of the week ' ) ;
3440
3440
expect ( datetimepicker . value ) . toBe ( null ) ;
3441
3441
} ) ;
3442
3442
it ( 'with format property -2' , ( ) => {
3443
3443
let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
3444
3444
document . body . appendChild ( inputEle ) ;
3445
- datetimepicker = new DateTimePicker ( { enableMask : true , format : 'MM/dd/yyyy' } ) ;
3445
+ datetimepicker = new DateTimePicker ( { enableMask : true , format : 'MM/dd/yyyy EEEEE ' } ) ;
3446
3446
datetimepicker . appendTo ( '#datetimepicker' ) ;
3447
- expect ( datetimepicker . element . value ) . toBe ( 'month/day/year' ) ;
3447
+ expect ( datetimepicker . element . value ) . toBe ( 'month/day/year day of the week ' ) ;
3448
3448
expect ( datetimepicker . value ) . toBe ( null ) ;
3449
3449
} ) ;
3450
3450
it ( 'with format property -3' , ( ) => {
@@ -3466,7 +3466,7 @@ describe('Datetimepicker', () => {
3466
3466
it ( 'with format property -5' , ( ) => {
3467
3467
let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
3468
3468
document . body . appendChild ( inputEle ) ;
3469
- datetimepicker = new DateTimePicker ( { enableMask : true , format : 'dd/MM/yy ddd ' } ) ;
3469
+ datetimepicker = new DateTimePicker ( { enableMask : true , format : 'dd/MM/yy E ' } ) ;
3470
3470
datetimepicker . appendTo ( '#datetimepicker' ) ;
3471
3471
expect ( datetimepicker . element . value ) . toBe ( 'day/month/year day of the week' ) ;
3472
3472
expect ( datetimepicker . value ) . toBe ( null ) ;
@@ -3518,6 +3518,17 @@ describe('Datetimepicker', () => {
3518
3518
datetimepicker . keydownHandler ( keyEventArgs ) ;
3519
3519
expect ( datetimepicker . element . selectionStart ) . toBe ( 10 ) ;
3520
3520
expect ( datetimepicker . element . selectionEnd ) . toBe ( 14 ) ;
3521
+ keyEventArgs . action = keyEventArgs . key = keyEventArgs . code = 'Home' ;
3522
+ datetimepicker . keydownHandler ( keyEventArgs ) ;
3523
+ expect ( datetimepicker . element . selectionStart ) . toBe ( 0 ) ;
3524
+ expect ( datetimepicker . element . selectionEnd ) . toBe ( 3 ) ;
3525
+ keyEventArgs . action = keyEventArgs . key = keyEventArgs . code = 'End' ;
3526
+ datetimepicker . keydownHandler ( keyEventArgs ) ;
3527
+ expect ( datetimepicker . element . selectionStart ) . toBe ( 10 ) ;
3528
+ expect ( datetimepicker . element . selectionEnd ) . toBe ( 14 ) ;
3529
+
3530
+
3531
+
3521
3532
} ) ;
3522
3533
it ( 'Selection navigation using tab and shiftTab ' , ( ) => {
3523
3534
let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
@@ -3548,7 +3559,7 @@ describe('Datetimepicker', () => {
3548
3559
it ( 'Increment and decrement of date using up arrow' , ( ) => {
3549
3560
let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
3550
3561
document . body . appendChild ( inputEle ) ;
3551
- datetimepicker = new DateTimePicker ( { enableMask : true , format : 'dd /MM/yyyy hh:mm:ss' } ) ;
3562
+ datetimepicker = new DateTimePicker ( { enableMask : true , format : 'd /MM/yyyy hh:mm:ss' } ) ;
3552
3563
datetimepicker . appendTo ( '#datetimepicker' ) ;
3553
3564
datetimepicker . focusIn ( ) ;
3554
3565
expect ( datetimepicker . element . value ) . toBe ( 'day/month/year hour:minute:second' ) ;
0 commit comments