File tree Expand file tree Collapse file tree 1 file changed +8
-5
lines changed Expand file tree Collapse file tree 1 file changed +8
-5
lines changed Original file line number Diff line number Diff line change 76
76
77
77
if ( ! this . defaults . timeOnly ) {
78
78
//the time should come after x number of characters and a space. x = at least the length of text specified by the date format
79
- regstr = '.{' + this . defaults . timeFormat . length + ',}\\s+' + regstr ;
79
+ regstr = '.{' + this . defaults . dateFormat . length + ',}\\s+' + regstr ;
80
80
}
81
81
82
82
var order = this . getFormatPositions ( ) ;
306
306
var formattedDateTime = this . formattedDate ;
307
307
var timeAvailable = dt !== null && tp_inst . timeDefined ;
308
308
309
- if ( this . defaults . timeOnly !== true && ( this . defaults . alwaysSetTime || timeAvailable ) ) {
309
+ if ( this . defaults . timeOnly === true ) {
310
+ formattedDateTime = this . formattedTime ;
311
+ }
312
+ else if ( this . defaults . timeOnly !== true && ( this . defaults . alwaysSetTime || timeAvailable ) ) {
310
313
formattedDateTime += ' ' + this . formattedTime ;
311
314
}
312
315
315
318
} ,
316
319
317
320
setDefaults : function ( settings ) {
318
- extendRemove ( this . defaults , settings || { } ) ;
319
- return this ;
320
- }
321
+ extendRemove ( this . defaults , settings || { } ) ;
322
+ return this ;
323
+ }
321
324
} ;
322
325
323
326
//########################################################################
You can’t perform that action at this time.
0 commit comments