extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-14 03:54:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backport commit r48252, committed by Nathan Gray. More time fixes:

Browse Source 
- Also accept string timestamps in Zulu time
- Fix change detection causing nextmatch filter to not work
This commit is contained in:
Hadi Nategh 2014-08-26 13:38:42 +00:00
parent 59b14512cd
commit c3ae1410ea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/js/et2_widget_date.js
View File

@ -107,7 +107,7 @@ var et2_date = et2_inputWidget.extend(
},
set_value: function(_value) {
var old_value = this.getValue();
var old_value = this._oldValue;
if(_value === null || _value === "" || _value === undefined ||
// allow 0 as empty-value for date and date-time widgets, as that is used a lot eg. in InfoLog
_value == 0 && (this._type == 'date-time' || this._type == 'date'))
@ -125,7 +125,7 @@ var et2_date = et2_inputWidget.extend(
}
// Check for full timestamp
if(typeof _value == 'string' && _value.match(/(\d{4})-(\d{2})-(\d{2})T(\d{2})\:(\d{2})\:(\d{2})[+-](\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}))/))
{
_value = new Date(_value);
}