extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar - fix sorting users in day view would sometimes disconnect header from day

Browse Source
This commit is contained in:
nathangray 2017-03-21 09:17:31 -06:00
parent 983a72b3ab
commit 8aa4628f76
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/app.js
View File

@ -608,6 +608,9 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
parent = widget._parent; parent = widget._parent;
children.splice(idx,0,widget); children.splice(idx,0,widget);
},this,et2_calendar_daycol); },this,et2_calendar_daycol);
parent.day_widgets.sort(function(a,b) {
return children.indexOf(a) - children.indexOf(b);
});
} }
else else
{ {
@ -625,6 +628,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
// Directly update, since there is no other changes needed, // Directly update, since there is no other changes needed,
// and we don't want the current sort order applied // and we don't want the current sort order applied
app.calendar.state.owner = sortedArr; app.calendar.state.owner = sortedArr;
parent.options.owner = sortedArr;
} }
} }
}); });

2
calendar/js/et2_widget_event.js
View File

@ -465,7 +465,7 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
* @return {String} * @return {String}
*/ */
_tooltip: function() { _tooltip: function() {
if(!this.div) return ''; if(!this.div || !this.options.value || !this.options.value.app_id) return '';
var border = this.div.css('borderTopColor'); var border = this.div.css('borderTopColor');
var bg_color = this.div.css('background-color'); var bg_color = this.div.css('background-color');