holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix calendar scrolls to the last event when editing with a hidden event after work hours.

Browse Source
This commit is contained in:
Nathan Gray 2015-11-23 21:31:21 +00:00
parent 32d562822b
commit 47c1839b01
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/js/app.js
View File

@ -265,13 +265,14 @@ app.classes.calendar = AppJS.extend(
) )
{ {
var multiple_owner = typeof this.state.owner != 'string' && var multiple_owner = typeof this.state.owner != 'string' &&
this.state.owner.length < parseInt(this.egw.config('calview_no_consolidate','phpgwapi') || 5) ? true : false; this.state.owner.length > 1 &&
this.state.owner.length < parseInt(this.egw.config('calview_no_consolidate','phpgwapi') || 5);
for(var i = 0; i < this.state.owner.length; i++) for(var i = 0; i < this.state.owner.length; i++)
{ {
var owner = multiple_owner ? this.state.owner[i] : this.state.owner var owner = multiple_owner ? this.state.owner[i] : this.state.owner
var new_cache_id = app.classes.calendar._daywise_cache_id(event.data.date, owner) var new_cache_id = app.classes.calendar._daywise_cache_id(event.data.date, owner)
var daywise = egw.dataGetUIDdata(new_cache_id); var daywise = egw.dataGetUIDdata(new_cache_id);
daywise = daywise ? daywise.data : []; daywise = daywise && daywise.data != null ? daywise.data : [];
if(daywise.indexOf(_id) >= 0 && (_type === 'delete' || if(daywise.indexOf(_id) >= 0 && (_type === 'delete' ||
// Make sure we only update the calendars of those actually in the event // Make sure we only update the calendars of those actually in the event
multiple_owner && typeof event.data.participants[owner] == 'undefined')) multiple_owner && typeof event.data.participants[owner] == 'undefined'))

4
calendar/js/et2_widget_daycol.js
View File

@ -541,8 +541,8 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM],
{ {
indicator = $j('<div class="hiddenEventAfter"></div>') indicator = $j('<div class="hiddenEventAfter"></div>')
.text(event.options.value.title) .text(event.options.value.title)
.attr('data-hidden_count', 1); .attr('data-hidden_count', 1)
this.div.append(indicator) .appendTo(this.div)
.on('click', function() { .on('click', function() {
$j('.calendar_calEvent',day.div).last()[0].scrollIntoView(false); $j('.calendar_calEvent',day.div).last()[0].scrollIntoView(false);
// Better re-run this to clean up // Better re-run this to clean up