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

Handle converting string date/time formats to Date object for date-time widget

Browse Source
This commit is contained in:
Hadi Nategh 2014-05-05 14:09:47 +00:00
parent 9e4a03c59c
commit 62fa190439
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etemplate/js/et2_widget_date.js
View File

@ -609,11 +609,14 @@ var et2_date_ro = et2_valueWidget.extend([et2_IDetachedDOM],
if(typeof _value == 'string' && isNaN(_value))
{
var text = new Date(_value);
// Handle timezone offset - times are already in user time, but parse does UTC
var localOffset = text.getTimezoneOffset() * 60000;
// parseDateTime to handle string PHP: DateTime local date/time format
var parsed = (typeof jQuery.datepicker.parseDateTime("yy-mm-dd","hh:mm:ss", _value) !='undefined')?
jQuery.datepicker.parseDateTime("yy-mm-dd","hh:mm:ss", _value):
jQuery.datepicker.parseDateTime(this.egw().preference('dateformat'),this.egw().preference('timeformat') == '24' ? 'H:i' : 'g:i a', _value);
var text = new Date(parsed);
// JS dates use milliseconds
this.date.setTime(text.valueOf()+localOffset);
this.date.setTime(text.valueOf());
}
else
{