diff --git a/calendar/js/et2_widget_daycol.js b/calendar/js/et2_widget_daycol.js index 9487ab3eae..ebd2ff1a15 100644 --- a/calendar/js/et2_widget_daycol.js +++ b/calendar/js/et2_widget_daycol.js @@ -23,7 +23,7 @@ * * @augments et2_DOMWidget */ -var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizeable], +var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM], { attributes: { @@ -781,12 +781,6 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea } }, - // Resizable interface - resize: function (_height) - { - this.display_settings.titleHeight = (this.title.height()/_height)*100; - }, - /** * Code for implementing et2_IDetachedDOM * diff --git a/calendar/js/et2_widget_timegrid.js b/calendar/js/et2_widget_timegrid.js index 0004457122..4040cf6e19 100644 --- a/calendar/js/et2_widget_timegrid.js +++ b/calendar/js/et2_widget_timegrid.js @@ -598,6 +598,12 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz this.day_list = this._calculate_day_list(this.options.start_date, this.options.end_date, this.options.show_weekend); } var day_width = ( this.days.width()/this.day_list.length); + if(!day_width || !this.day_list) + { + // Hidden on another tab, or no days for some reason + var dim = egw.getHiddenDimensions(this.days, false); + day_width = ( dim.w /Math.max(this.day_list.length,1)); + } // Create any needed widgets - otherwise, we'll just recycle // Add any needed day widgets (now showing more days)