extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:04:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

inline calendar is not existing in html5, so allways use datepicker instead

Browse Source
This commit is contained in:
Ralf Becker 2016-02-10 16:39:43 +00:00
parent 34519b1e6b
commit c25403bec7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etemplate/js/et2_widget_date.js
View File

@ -99,9 +99,6 @@ String: A string in the user\'s date format, or a relative date. Relative dates
this.date.setMinutes(0); this.date.setMinutes(0);
this.date.setSeconds(0); this.date.setSeconds(0);
this.input = null; this.input = null;
this.is_mobile = egwIsMobile();
this.dateFormat = this.is_mobile ? 'yy-mm-dd' : this.egw().dateTimeFormat(this.egw().preference("dateformat"));
this.timeFormat = this.is_mobile ? 'HH:mm' : this.egw().preference("timeformat") == 12 ? "h:mmtt" : "HH:mm";
this.createInputWidget(); this.createInputWidget();
}, },
@ -118,8 +115,13 @@ String: A string in the user\'s date format, or a relative date. Relative dates
this.setDOMNode(this.span[0]); this.setDOMNode(this.span[0]);
// inline calendar is not existing in html5, so allways use datepicker instead
this.is_mobile = egwIsMobile() && !this.options.inline;
if (this.is_mobile) if (this.is_mobile)
{ {
this.dateFormat = 'yy-mm-dd';
this.timeFormat = 'HH:mm';
switch(this._type) switch(this._type)
{ {
case 'date': case 'date':
@ -136,6 +138,8 @@ String: A string in the user\'s date format, or a relative date. Relative dates
} }
else else
{ {
this.dateFormat = this.egw().dateTimeFormat(this.egw().preference("dateformat"));
this.timeFormat = this.egw().preference("timeformat") == 12 ? "h:mmtt" : "HH:mm";
// jQuery-UI date picker // jQuery-UI date picker
if(this._type != 'date-timeonly') if(this._type != 'date-timeonly')
{ {