@@ -3351,16 +3351,16 @@ function loadCultureFiles_mask(name: string, base?: boolean): void {
33513351
33523352L10n . load ( {
33533353 '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' }
33553355 } ,
33563356 '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' }
33583358 } ,
33593359 'zh' : {
3360- 'MaskedDateTime ' : { day : '日' , month : '月' , year : '年' , hour : '小時' , minute : '分鐘' , second :'第二' }
3360+ 'datetimepicker ' : { day : '日' , month : '月' , year : '年' , hour : '小時' , minute : '分鐘' , second :'第二' }
33613361 } ,
33623362 'ja' : {
3363- 'MaskedDateTime ' : { day : '日' , month : '月' , year : '年' , hour : '時間' , minute : '分' , second :'秒' }
3363+ 'datetimepicker ' : { day : '日' , month : '月' , year : '年' , hour : '時間' , minute : '分' , second :'秒' }
33643364 } ,
33653365} ) ;
33663366
@@ -3412,7 +3412,7 @@ describe('Datetimepicker', () => {
34123412 document . body . appendChild ( inputEle ) ;
34133413 datetimepicker = new DateTimePicker ( { enableMask : true } ) ;
34143414 datetimepicker . appendTo ( '#datetimepicker' ) ;
3415- expect ( datetimepicker . element . value ) . toBe ( 'day/ month/year' ) ;
3415+ expect ( datetimepicker . element . value ) . toBe ( 'month/day/ year hour:minute AM ' ) ;
34163416 expect ( datetimepicker . value ) . toBe ( null ) ;
34173417 } ) ;
34183418 it ( 'Rendering with maskPlaceholder as custom type ' , ( ) => {
@@ -3426,25 +3426,25 @@ describe('Datetimepicker', () => {
34263426 it ( 'With format property ' , ( ) => {
34273427 let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
34283428 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 ' } ) ;
34303430 datetimepicker . appendTo ( '#datetimepicker' ) ;
34313431 expect ( datetimepicker . element . value ) . toBe ( 'day:month:year day of the week' ) ;
34323432 expect ( datetimepicker . value ) . toBe ( null ) ;
34333433 } ) ;
34343434 it ( 'With format property -1 ' , ( ) => {
34353435 let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
34363436 document . body . appendChild ( inputEle ) ;
3437- datetimepicker = new DateTimePicker ( { enableMask : true , format : 'MM yyyy' } ) ;
3437+ datetimepicker = new DateTimePicker ( { enableMask : true , format : 'MM yyyy EEEE ' } ) ;
34383438 datetimepicker . appendTo ( '#datetimepicker' ) ;
3439- expect ( datetimepicker . element . value ) . toBe ( 'month year' ) ;
3439+ expect ( datetimepicker . element . value ) . toBe ( 'month year day of the week ' ) ;
34403440 expect ( datetimepicker . value ) . toBe ( null ) ;
34413441 } ) ;
34423442 it ( 'with format property -2' , ( ) => {
34433443 let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
34443444 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 ' } ) ;
34463446 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 ' ) ;
34483448 expect ( datetimepicker . value ) . toBe ( null ) ;
34493449 } ) ;
34503450 it ( 'with format property -3' , ( ) => {
@@ -3466,7 +3466,7 @@ describe('Datetimepicker', () => {
34663466 it ( 'with format property -5' , ( ) => {
34673467 let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
34683468 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 ' } ) ;
34703470 datetimepicker . appendTo ( '#datetimepicker' ) ;
34713471 expect ( datetimepicker . element . value ) . toBe ( 'day/month/year day of the week' ) ;
34723472 expect ( datetimepicker . value ) . toBe ( null ) ;
@@ -3518,6 +3518,17 @@ describe('Datetimepicker', () => {
35183518 datetimepicker . keydownHandler ( keyEventArgs ) ;
35193519 expect ( datetimepicker . element . selectionStart ) . toBe ( 10 ) ;
35203520 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+
35213532 } ) ;
35223533 it ( 'Selection navigation using tab and shiftTab ' , ( ) => {
35233534 let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
@@ -3548,7 +3559,7 @@ describe('Datetimepicker', () => {
35483559 it ( 'Increment and decrement of date using up arrow' , ( ) => {
35493560 let inputEle : HTMLElement = createElement ( 'input' , { id : 'datetimepicker' } ) ;
35503561 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' } ) ;
35523563 datetimepicker . appendTo ( '#datetimepicker' ) ;
35533564 datetimepicker . focusIn ( ) ;
35543565 expect ( datetimepicker . element . value ) . toBe ( 'day/month/year hour:minute:second' ) ;
0 commit comments