@@ -23,9 +23,9 @@ export interface ITimepickerEvent {
2323 } ;
2424}
2525
26- declare var $ : any ;
27- declare var jQuery : any ;
28- declare var moment : any ;
26+ declare let $ : any ;
27+ declare let jQuery : any ;
28+ declare let moment : any ;
2929
3030
3131@Component ( {
@@ -74,7 +74,7 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
7474 @Output ( ) dateChange : EventEmitter < Date > = new EventEmitter < Date > ( ) ;
7575 @Input ( 'timepicker' ) timepickerOptions : any = { } ;
7676 @Input ( 'datepicker' ) datepickerOptions : any = { } ;
77- @Input ( 'hasClearButton' ) hasClearButton : boolean = false ;
77+ @Input ( 'hasClearButton' ) hasClearButton = false ;
7878 @Input ( ) readonly : boolean ;
7979 @Input ( ) required : boolean ;
8080 @Input ( ) tabindex : string ;
@@ -94,10 +94,12 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
9494 @HostListener ( 'dateChange' , [ '$event' ] )
9595 onChange = ( _ : any ) => {
9696 }
97+
9798 @HostListener ( 'blur' )
9899 onTouched = ( ) => {
99100 }
100101
102+
101103 @HostBinding ( 'attr.tabindex' )
102104 get tabindexAttr ( ) : string | undefined {
103105 return this . tabindex === undefined ? '-1' : undefined ;
@@ -149,7 +151,7 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
149151 }
150152
151153 writeValue ( value : any ) : void {
152- var m = moment . utc ( value + 'T00:00:00+00:00' , 'mm -DD-yyyy ' ) . toDate ( ) ;
154+ const m = moment . utc ( value + 'T00:00:00+00:00' , 'MM -DD-YYYY ' ) . toDate ( ) ;
153155 this . date = m ;
154156 if ( isDate ( this . date ) ) {
155157 setTimeout ( ( ) => {
@@ -200,20 +202,18 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
200202 if ( ! this . datepicker && this . datepickerOptions !== false ) {
201203 let options = jQuery . extend ( { enableOnReadonly : ! this . readonly } , this . datepickerOptions ) ;
202204
203- options . format = 'dd-mm-yyyy' ;
205+ options . format = 'yyyy-mm-dd' ; // ' dd-mm-yyyy';
204206
205207 this . datepicker = ( < any > $ ( '#' + this . idDatePicker ) ) . datepicker ( options ) ;
206208 this . datepicker
207209 . on ( 'changeDate' , ( e : any ) => {
208210 let newDate : Date = e . date ;
209-
210211 if ( isDate ( this . date ) && isDate ( newDate ) ) {
211212 // get hours/minutes
212213 newDate . setHours ( this . date . getHours ( ) ) ;
213214 newDate . setMinutes ( this . date . getMinutes ( ) ) ;
214215 newDate . setSeconds ( this . date . getSeconds ( ) ) ;
215216 }
216-
217217 this . date = newDate ;
218218 this . dateChange . emit ( newDate ) ;
219219 } ) ;
@@ -222,7 +222,7 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
222222 }
223223
224224 if ( ! this . timepicker && this . timepickerOptions !== false ) {
225- let options = jQuery . extend ( { defaultTime : false } , this . timepickerOptions ) ;
225+ const options = jQuery . extend ( { defaultTime : false } , this . timepickerOptions ) ;
226226 this . timepicker = ( < any > $ ( '#' + this . idTimePicker ) ) . timepicker ( options ) ;
227227 this . timepicker
228228 . on ( 'changeTime.timepicker' , ( e : ITimepickerEvent ) => {
@@ -290,6 +290,7 @@ export class ElementDateComponent implements ControlValueAccessor, AfterViewInit
290290}
291291
292292let id = 0 ;
293+
293294function uniqueId ( prefix : string ) : string {
294295 return prefix + ++ id ;
295296}
0 commit comments