library-mirrors/datetimepicker
1
0
Fork 0
mirror of https://github.com/xdan/datetimepicker.git synced 2024-11-18 06:24:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #140 from estudiotrilha/master

Browse Source 
startDate priority override
This commit is contained in:
Valeriy 2014-06-30 17:10:26 +06:00
commit 83b767e632
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jquery.datetimepicker.js
View File

@ -1256,15 +1256,22 @@
datetimepicker.setOptions(options); datetimepicker.setOptions(options);
function getCurrentValue(){ function getCurrentValue(){
var ct = options.value?options.value:(input&&input.val&&input.val())?input.val():'';
if( ct && _xdsoft_datetime.isValidDate(ct = Date.parseDate(ct, options.format)) ) { var ct = false;
datetimepicker.data('changed',true);
}else
ct = '';
if( !ct && options.startDate!==false ){ if (options.startDate instanceof Date && !isNaN(options.startDate.valueOf())) {
ct = options.startDate;
} else if (!ct && options.startDate!==false) {
ct = _xdsoft_datetime.strToDateTime(options.startDate); 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);
} else {
ct = '';
} }
return ct?ct:0; return ct?ct:0;