extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 09:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to correctly handle timezone offset on the other side of the world

Browse Source
This commit is contained in:
Nathan Gray 2014-08-20 14:39:42 +00:00
parent a78fda8400
commit 4d5f5677e1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etemplate/js/et2_widget_date.js
View File

@ -192,13 +192,12 @@ var et2_date = et2_inputWidget.extend(
this.set_validation_error(this.egw().lang("%1' han an invalid format !!!",_value));
return;
}
// These should be the same, but this should clear any offset problems
parsed.setUTCHours(parsed.getHours());
}
// Update local variable, but remove the timezone offset that javascript adds by using timestamp
// Update local variable, but remove the timezone offset that
// javascript adds when we parse
if(parsed)
{
this.date = new Date(parsed.valueOf());
this.date = new Date(parsed.valueOf() - parsed.getTimezoneOffset() * 60000);
}
this.set_validation_error(false);
@ -215,6 +214,7 @@ var et2_date = et2_inputWidget.extend(
// Update input - popups do, but framework doesn't
_value = '';
// Add timezone offset back in, or formatDate will lose those hours
var formatDate = new Date(this.date.valueOf() + this.date.getTimezoneOffset() * 60 * 1000);
if(this._type != 'date-timeonly')
{
@ -227,8 +227,8 @@ var et2_date = et2_inputWidget.extend(
if(this._type != 'date-timeonly') _value += ' ';
_value += jQuery.datepicker.formatTime(this.input_date.datepicker("option","timeFormat"),{
hour: this.date.getUTCHours(),
minute: this.date.getMinutes(),
hour: formatDate.getHours(),
minute: formatDate.getMinutes(),
seconds: 0,
timezone: 0
});