mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 00:54:15 +01:00
Update timepicker, some work on date-timeonly so it returns a value
This commit is contained in:
parent
b5ca4ac505
commit
dba3bcc2aa
@ -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
3268
phpgwapi/js/jquery/jquery-ui-timepicker-addon.js
vendored
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user