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
Show Stats 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
{

3268
phpgwapi/js/jquery/jquery-ui-timepicker-addon.js vendored
View File

File diff suppressed because it is too large Load Diff

2
phpgwapi/js/jsapi/egw_calendar.js
View File

@ -49,7 +49,7 @@ egw.extend('calendar', egw.MODULE_WND_LOCAL, function(_app, _wnd) {
function timePreferences(_egw)
{
return {
"timeFormat": egw.preference("timeformat") == 12 ? "h:mm tt" : "hh:mm",
"timeFormat": egw.preference("timeformat") == 12 ? "h:mm tt" : "HH:mm",
"ampm": (egw.preference("timeformat") == "12"),
"hourGrid": 4,
"minuteGrid": 10