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

Make sure single day does not get partially covered by todos

Browse Source
This commit is contained in:
nathangray 2016-07-04 09:17:34 -06:00
parent d91dc5a58b
commit 3e92b81d0c
2 changed files with 4 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

@ -2260,11 +2260,8 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
} }
else else
{ {
jQuery(app.classes.calendar.views.day.etemplates[1].DOMContainer).show();
jQuery(app.classes.calendar.views.day.etemplates[1].DOMContainer).css("left","100%"); jQuery(app.classes.calendar.views.day.etemplates[1].DOMContainer).css("left","100%");
window.setTimeout(jQuery.proxy(function() { jQuery(app.classes.calendar.views.day.etemplates[1].DOMContainer).hide();
jQuery(this).hide();
},app.classes.calendar.views.day.etemplates[1].DOMContainer),1000);
jQuery(app.classes.calendar.views.day.etemplates[0].DOMContainer).css("width","100%"); jQuery(app.classes.calendar.views.day.etemplates[0].DOMContainer).css("width","100%");
view.etemplates[0].widgetContainer.iterateOver(function(w) { view.etemplates[0].widgetContainer.iterateOver(function(w) {
w.set_width('100%'); w.set_width('100%');

3
calendar/js/et2_widget_timegrid.js
View File

@ -2023,6 +2023,9 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
// Try to resize width, though animations cause problems // Try to resize width, though animations cause problems
var total_width = jQuery(this.getInstanceManager().DOMContainer).parent().innerWidth() - this.days.position().left; var total_width = jQuery(this.getInstanceManager().DOMContainer).parent().innerWidth() - this.days.position().left;
// Space for todos, if there
total_width -= jQuery(this.getInstanceManager().DOMContainer).siblings().has(':visible').not('#calendar-toolbar').outerWidth()
var day_width = (total_width > 0 ? total_width : jQuery(this.getInstanceManager().DOMContainer).width())/this.day_widgets.length; var day_width = (total_width > 0 ? total_width : jQuery(this.getInstanceManager().DOMContainer).width())/this.day_widgets.length;
// update day widgets // update day widgets
for(var i = 0; i < this.day_widgets.length; i++) for(var i = 0; i < this.day_widgets.length; i++)