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

Fix events oversized by the border height

Browse Source
This commit is contained in:
Nathan Gray 2015-12-15 17:43:03 +00:00
parent 4d5f8da0c9
commit 9a53499c77
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/et2_widget_daycol.js
View File

@ -475,7 +475,7 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM],
var docViewTop = timegrid.scrolling.scrollTop(),
docViewBottom = docViewTop + timegrid.scrolling.height(),
elemTop = elem.position().top,
elemBottom = elemTop + elem.outerHeight();
elemBottom = elemTop + elem.outerHeight(true);
if((elemBottom <= docViewBottom) && (elemTop >= docViewTop))
{
// Entirely visible
@ -718,6 +718,11 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM],
{
columns[c][i].div.css('top', top+'%');
columns[c][i].div.css('height', height+'%');
// Remove spacing from border
var border_diff = columns[c][i].div.outerHeight() - columns[c][i].div.height();
columns[c][i].div.css('height',columns[c][i].div.height() - border_diff);
// This gives the wrong height
//columns[c][i].div.outerHeight(height+'%');
columns[c][i].div.css('left', left.toFixed(1)+'%');
columns[c][i].div.css('width', width.toFixed(1)+'%');
columns[c][i].div.css('z-index',parseInt(20)+c);