From 7a79c9e088ac20a8fe0bf5801259ca95866034ca Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 9 Nov 2015 21:21:17 +0000 Subject: [PATCH] Calendar display: - Fix full day infologs sometimes showing as gray box without title --- calendar/js/et2_widget_daycol.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/calendar/js/et2_widget_daycol.js b/calendar/js/et2_widget_daycol.js index ebd2ff1a15..b6d53981d5 100644 --- a/calendar/js/et2_widget_daycol.js +++ b/calendar/js/et2_widget_daycol.js @@ -417,14 +417,15 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM], events.sort(function(a,b) { var start = new Date(a.start) - new Date(b.start); var end = new Date(a.end) - new Date(b.end); - return a.whole_day ? -1 : (start ? start : end); + // Whole day events sorted by ID, normal events by start / end time + return a.whole_day ? (a.app_id - b.app_id) : (start ? start : end); }); for(var c = 0; c < events.length; c++) { // Create event var event = et2_createWidget('calendar-event',{ - id:events[c].app_id||events[c].id, + id:events[c].id, value: events[c] },this); if(this.isInTree()) @@ -439,7 +440,7 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM], // Seperate loop so column sorting finds all children in the right place for(var c = 0; c < events.length && c < this._children.length; c++) { - this._children[c].set_value(events[c]); + this.getWidgetById(events[c].id).set_value(events[c]); } // Apply styles to hidden events