extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-18 20:51:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix handling of timestamps in usertime on client-side, by using date("Y-m-d\TH:i:s\Z", ts) equivalent to PHP date function we use on server-side, fixes wrong time in alarms, if server- and user-timezone differ

Browse Source
This commit is contained in:
Ralf Becker 2014-09-30 20:13:15 +00:00
parent 9057821241
commit d102b7782c
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
etemplate/js/et2_widget_date.js
View File

@ -240,6 +240,11 @@ var et2_date = et2_inputWidget.extend(
return; return;
} }
// timestamp in usertime, convert to 'Y-m-d\\TH:i:s\\Z', as we do on server-side with equivalent of PHP date()
if (typeof _value == 'number' || typeof _value == 'string' && !isNaN(_value) && _value[0] != '+' && _value[0] != '-')
{
_value = date('Y-m-d\\TH:i:s\\Z', _value);
}
// Check for full timestamp // 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}))/)) 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}))/))
{ {
@ -326,18 +331,10 @@ var et2_date = et2_inputWidget.extend(
this.date = _value.date; this.date = _value.date;
} else if (typeof _value == 'object' && _value.valueOf) { } else if (typeof _value == 'object' && _value.valueOf) {
this.date = _value; this.date = _value;
} else if (typeof _value == 'number' || !isNaN(_value)) { } else
// string starting with + or - --> add/substract number of seconds from current value // string starting with + or - --> add/substract number of seconds from current value
if (typeof _value == 'string' && (_value[0] == '+' || _value[0] == '-')) {
{ this.date.setTime(this.date.getTime()+1000*parseInt(_value));
this.date.setTime(this.date.getTime()+1000*parseInt(_value));
}
else
{
// Timestamp in usertime need to be corrected with timezoneoffset as we internally use UTC for egw usertime
// JS dates use milliseconds
this.date.setTime(1000*(parseInt(_value)-60*this.date.getTimezoneOffset()));
}
} }
// Update input - popups do, but framework doesn't // Update input - popups do, but framework doesn't
@ -806,8 +803,8 @@ var et2_date_ro = et2_valueWidget.extend([et2_IDetachedDOM],
} }
else else
{ {
// JS dates use milliseconds // _value is timestamp in usertime, ready to be used with date() function identical to PHP date()
this.date.setTime(parseInt(_value)*1000); this.date = _value;
} }
var display = this.date.toString(); var display = this.date.toString();