extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-22 05:12:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change evaluation order to get popup selector working again after last fix.

Browse Source
This commit is contained in:
Nathan Gray 2013-07-08 22:24:36 +00:00
parent 54eb53cdba
commit 2bd53e72d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etemplate/js/et2_widget_date.js
View File

@ -157,14 +157,14 @@ var et2_date = et2_inputWidget.extend(
this.date.setTime(text.valueOf()+localOffset); this.date.setTime(text.valueOf()+localOffset);
_value = Math.round(this.date.valueOf() / 1000); _value = Math.round(this.date.valueOf() / 1000);
} }
} else if (typeof _value == 'number' || !isNaN(_value)) {
// Timestamp
// JS dates use milliseconds
this.date.setTime(parseInt(_value)*1000);
} else if (typeof _value == 'object' && _value.date) { } else if (typeof _value == 'object' && _value.date) {
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)) {
// Timestamp
// JS dates use milliseconds
this.date.setTime(parseInt(_value)*1000);
} }
// Update input - popups do, but framework doesn't // Update input - popups do, but framework doesn't