extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-24 14:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix hidden calendars in desktop and mobile view

Browse Source
This commit is contained in:
nathan 2023-07-26 08:40:47 -06:00
parent 575c8fa976
commit 60cccc612b
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/js/et2_widget_timegrid.ts
View File

@ -698,17 +698,14 @@ export class et2_calendar_timegrid extends et2_calendar_view implements et2_IDet
{ {
var old_value = this.options.disabled; var old_value = this.options.disabled;
this.disabled = disabled; this.disabled = disabled;
let style = window.getComputedStyle(this.div.get(0));
if (style.display !== 'none' && style.display !== '') this.div.get(0).classList.toggle("hideme", disabled);
{
this.div.get(0).classList.toggle("hideme", disabled);
}
if(disabled) if(disabled)
{ {
this.loader.show(); this.loader.show();
} }
else if (old_value !== disabled) else if(old_value !== disabled)
{ {
// Scroll to start of day - stops jumping in FF // Scroll to start of day - stops jumping in FF
// For some reason on Chrome & FF this doesn't quite get the day start // For some reason on Chrome & FF this doesn't quite get the day start

1
calendar/templates/mobile/view.xet
View File

@ -23,7 +23,6 @@ Egroupware
<calendar-timegrid id="${row}" <calendar-timegrid id="${row}"
onchange="var state = {}; if(widget.options.start_date == widget.options.end_date) state.view = 'day'; app.calendar.update_state(state);let s = widget.getInstanceManager().app_obj.calendar.state;let d = new Date(s.date);import(egw.link('/api/js/etemplate/lib/date.js')).then((m)=>{widget.getInstanceManager().widgetContainer.getWidgetById('header_dateIndicator').set_value((s.view == 'day'?date('d', d)+'-':'')+egw.lang(date('M',d))+'-'+date('Y',d));});" onchange="var state = {}; if(widget.options.start_date == widget.options.end_date) state.view = 'day'; app.calendar.update_state(state);let s = widget.getInstanceManager().app_obj.calendar.state;let d = new Date(s.date);import(egw.link('/api/js/etemplate/lib/date.js')).then((m)=>{widget.getInstanceManager().widgetContainer.getWidgetById('header_dateIndicator').set_value((s.view == 'day'?date('d', d)+'-':'')+egw.lang(date('M',d))+'-'+date('Y',d));});"
onevent_change="app.calendar.event_change" onevent_change="app.calendar.event_change"
disabled="true"
> >
</calendar-timegrid> </calendar-timegrid>
</row> </row>