holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix set_min/set_max with a full string timestamp caused a formatting error

Browse Source
This commit is contained in:
Nathan Gray 2016-04-11 21:28:10 +00:00
parent 2fb1c0e31d
commit c6ab38a51d
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/js/etemplate/et2_widget_date.js
View File

@ -362,6 +362,17 @@ String: A string in the user\'s date format, or a relative date. Relative dates
}
else
{
// Check for full timestamp
if(typeof _value == 'string' && _value.match(/(\d{4})-(\d{2})-(\d{2})T(\d{2})\:(\d{2})\:(\d{2})(?:\.\d{3})?(?:Z|[+-](\d{2})\:(\d{2}))/))
{
_value = new Date(_value);
// Add timezone offset back in, or formatDate will lose those hours
var formatDate = new Date(_value + this.date.getTimezoneOffset() * 60 * 1000);
if(this._type == 'date')
{
_value = jQuery.datepicker.formatDate(this.dateFormat, formatDate);
}
}
this.input_date.datepicker('option','minDate',_value);
}
}
@ -405,6 +416,17 @@ String: A string in the user\'s date format, or a relative date. Relative dates
}
else
{
// Check for full timestamp
if(typeof _value == 'string' && _value.match(/(\d{4})-(\d{2})-(\d{2})T(\d{2})\:(\d{2})\:(\d{2})(?:\.\d{3})?(?:Z|[+-](\d{2})\:(\d{2}))/))
{
_value = new Date(_value);
// Add timezone offset back in, or formatDate will lose those hours
var formatDate = new Date(_value + this.date.getTimezoneOffset() * 60 * 1000);
if(this._type == 'date')
{
_value = jQuery.datepicker.formatDate(this.dateFormat, formatDate);
}
}
this.input_date.datepicker('option','maxDate',_value);
}
}