Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Teemu Pääkkönen 2014-01-08 14:56:03 +02:00
commit 4e1d9cc57e

View File

@ -38,6 +38,22 @@
dayOfWeek:[ dayOfWeek:[
"zo", "ma", "di", "wo", "do", "vr", "za" "zo", "ma", "di", "wo", "do", "vr", "za"
] ]
},
tr:{
months:[
"Ocak", "Şubat", "Mart", "Nisan", "Mayıs", "Haziran", "Temmuz", "Ağustos", "Eylül", "Ekim", "Kasım", "Aralık"
],
dayOfWeek:[
"Paz", "Pts", "Sal", "Çar", "Per", "Cum", "Cts"
]
},
fr:{
months:[
"Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"
],
dayOfWeek:[
"Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam"
]
} }
}, },
value:'', value:'',
@ -271,6 +287,7 @@
_xdsoft_datetime.currentTime[$(this).parent().parent().hasClass('xdsoft_monthselect')?'setMonth':'setFullYear']($(this).data('value')); _xdsoft_datetime.currentTime[$(this).parent().parent().hasClass('xdsoft_monthselect')?'setMonth':'setFullYear']($(this).data('value'));
$(this).parent().parent().hide(); $(this).parent().parent().hide();
datetimepicker.trigger('xchange.xdsoft'); datetimepicker.trigger('xchange.xdsoft');
options.onChangeMonth&&options.onChangeMonth.call&&options.onChangeMonth.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input'));
}); });
@ -428,11 +445,13 @@
.off('blur.xdsoft') .off('blur.xdsoft')
.on('blur.xdsoft', function() { .on('blur.xdsoft', function() {
if( options.allowBlank && !$.trim($(this).val()).length ) { if( options.allowBlank && !$.trim($(this).val()).length ) {
return true; $(this).val(null);
} }
else if( !Date.parseDate( $(this).val(), options.format ) ) { else if( !Date.parseDate( $(this).val(), options.format ) ) {
$(this).val((new Date()).dateFormat( options.format )); $(this).val((new Date()).dateFormat( options.format ));
} }
datetimepicker.data('xdsoft_datetime').setCurrentTime($(this).val());
datetimepicker.trigger('changedatetime.xdsoft');
}); });
} }
options.dayOfWeekStartPrev = (options.dayOfWeekStart==0)?6:options.dayOfWeekStart-1; options.dayOfWeekStartPrev = (options.dayOfWeekStart==0)?6:options.dayOfWeekStart-1;