mirror of
https://github.com/xdan/datetimepicker.git
synced 2024-11-18 06:24:22 +00:00
New version 2.1.2
This commit is contained in:
parent
17e017c688
commit
5ab993129a
@ -20,7 +20,7 @@
|
||||
"jquery",
|
||||
"touch"
|
||||
],
|
||||
"version": "2.1.1",
|
||||
"version": "2.1.2",
|
||||
"author": {
|
||||
"name": "Chupurnov Valeriy",
|
||||
"email": "chupurnov@gmail.com",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/**
|
||||
* @preserve jQuery DateTimePicker plugin v2.1.1
|
||||
* @preserve jQuery DateTimePicker plugin v2.1.2
|
||||
* @homepage http://xdsoft.net/jqplugins/datetimepicker/
|
||||
* (c) 2013, Chupurnov Valeriy.
|
||||
*/
|
||||
@ -49,7 +49,7 @@
|
||||
},
|
||||
fr:{
|
||||
months:[
|
||||
"Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"
|
||||
"Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"
|
||||
],
|
||||
dayOfWeek:[
|
||||
"Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam"
|
||||
@ -447,14 +447,12 @@
|
||||
if( options.allowBlank && !$.trim($(this).val()).length ) {
|
||||
$(this).val(null);
|
||||
datetimepicker.data('xdsoft_datetime').empty();
|
||||
}
|
||||
else if( !Date.parseDate( $(this).val(), options.format ) ) {
|
||||
}else if( !Date.parseDate( $(this).val(), options.format ) ) {
|
||||
$(this).val((new Date()).dateFormat( options.format ));
|
||||
datetimepicker.data('xdsoft_datetime').setCurrentTime($(this).val());
|
||||
}
|
||||
else
|
||||
+ {
|
||||
+ datetimepicker.data('xdsoft_datetime').setCurrentTime($(this).val());
|
||||
else{
|
||||
datetimepicker.data('xdsoft_datetime').setCurrentTime($(this).val());
|
||||
}
|
||||
datetimepicker.trigger('changedatetime.xdsoft');
|
||||
});
|
||||
@ -514,8 +512,8 @@
|
||||
};
|
||||
|
||||
_this.empty = function() {
|
||||
+ _this.currentTime = null;
|
||||
+ };
|
||||
_this.currentTime = null;
|
||||
};
|
||||
|
||||
_this.getCurrentTime = function( dTime) {
|
||||
return _this.currentTime;
|
||||
|
Loading…
Reference in New Issue
Block a user