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

Update timepicker, some work on date-timeonly so it returns a value

Browse Source
This commit is contained in:
Nathan Gray
2013-08-20 18:37:09 +00:00
parent b5ca4ac505
commit dba3bcc2aa
3 changed files with 2044 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/js/et2_widget_date.js
View File

@ -179,6 +179,10 @@ var et2_date = et2_inputWidget.extend(
{
current += " ";
}
else
{
current = '';
}
this.input_date.val(current + jQuery.datepicker.formatTime(this.input_date.datepicker("option","timeFormat"),{
hour: this.date.getHours(),
minute: this.date.getMinutes(),
@ -200,7 +204,7 @@ var et2_date = et2_inputWidget.extend(
}
if(this._type == "date-timeonly")
{
return this.value;
return this.input_date.val();
}
else
{