startDate priority override

This commit is contained in:
Pedro Goes 2014-06-09 16:44:51 +01:00
parent e94b766df3
commit db71119edb

View File

@ -1229,16 +1229,23 @@
datetimepicker.setOptions(options); datetimepicker.setOptions(options);
function getCurrentValue(){ function getCurrentValue(){
var ct = options.value?options.value:(input&&input.val&&input.val())?input.val():'';
var ct = false;
if( ct && _xdsoft_datetime.isValidDate(ct = Date.parseDate(ct, options.format)) ) {
if (options.startDate instanceof Date && !isNaN(options.startDate.valueOf())) {
ct = options.startDate;
} else if (!ct && options.startDate!==false) {
ct = _xdsoft_datetime.strToDateTime(options.startDate);
} else if (!ct) {
ct = options.value?options.value:(input&&input.val&&input.val())?input.val():'';
ct = Date.parseDate(ct, options.format);
}
if ( ct && _xdsoft_datetime.isValidDate(ct) ) {
datetimepicker.data('changed',true); datetimepicker.data('changed',true);
}else } else {
ct = ''; ct = '';
}
if( !ct && options.startDate!==false ){
ct = _xdsoft_datetime.strToDateTime(options.startDate);
}
return ct?ct:0; return ct?ct:0;
} }