extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-10 13:08:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: Stop constant flickering in planner view

Browse Source
This commit is contained in:
nathan 2025-03-06 13:27:16 -07:00
parent cc6ea74648
commit 548e8a2700
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
calendar/js/et2_widget_planner.ts
View File

@ -838,32 +838,14 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
var label_index = false; var label_index = false;
var category = cats[cat] ? parseInt(cats[cat],10) : false; var category = cats[cat] ? parseInt(cats[cat],10) : false;
if(category == 0 || !category) category = ''; if(category == 0 || !category) category = '';
for(var i = 0; i < labels.length; i++) const indexCheck = (l) => l.value == category || l.id == category || typeof l.children != "undefined" && l.children.findIndex(indexCheck) != -1;
{ label_index = labels.findIndex(indexCheck);
if(labels[i].id == category)
{ if(label_index !== -1 && typeof rows[label_index] === 'undefined')
// If there's no cat filter, only show the top level
if(!app_calendar.state.cat_id)
{
for(var j = 0; j < labels.length; j++)
{
if(labels[j].id == labels[i].main)
{
label_index = j;
break;
}
}
break;
}
label_index = i;
break;
}
}
if(label_index !== false && typeof rows[label_index] === 'undefined')
{ {
rows[label_index] = []; rows[label_index] = [];
} }
if(label_index !== false && rows[label_index].indexOf(event) === -1) if(label_index !== -1 && rows[label_index].indexOf(event) === -1)
{ {
rows[label_index].push(event); rows[label_index].push(event);
} }
@ -2076,11 +2058,11 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
this._deferred_row_updates[id] = window.setTimeout(jQuery.proxy(this._deferred_row_update, this, id), et2_calendar_planner.DEFERRED_ROW_TIME); this._deferred_row_updates[id] = window.setTimeout(jQuery.proxy(this._deferred_row_update, this, id), et2_calendar_planner.DEFERRED_ROW_TIME);
} }
} }
else else if(event.data)
{ {
// Could be an event no row is interested in, could be a problem. // Could be an event no row is interested in, could be a problem.
// Just redraw everything // Just ignore it
invalidate = true; console.log("Event could not be grouped", event.data.app_id + ": " + event.data.title);
continue; continue;
} }