extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix all day non-blocking overflow calculation causing false positives

Browse Source
This commit is contained in:
Nathan Gray 2016-04-27 22:23:06 +00:00
parent 91b8995938
commit 40bdd2771d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/et2_widget_daycol.js
View File

@ -569,7 +569,7 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
} }
// Check all day overflow // Check all day overflow
this.all_day.toggleClass('overflown', this.all_day.toggleClass('overflown',
this.all_day[0].scrollHeight - this.all_day.height() > 5 this.all_day[0].scrollHeight - this.all_day.innerHeight() > 5
); );
// Check each event // Check each event
@ -1000,7 +1000,7 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
// Click on the title // Click on the title
if ($j(_ev.target).hasClass('calendar_calAddEvent')) if ($j(_ev.target).hasClass('calendar_calAddEvent'))
{ {
if(!_ev.target.dataset.whole_day) if(this.header.has(_ev.target).length == 0 && !_ev.target.dataset.whole_day)
{ {
// Default handler to open a new event at the selected time // Default handler to open a new event at the selected time
var options = { var options = {

5
calendar/js/et2_widget_timegrid.js
View File

@ -1708,11 +1708,12 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
delete this.gridHover[0].dataset[id]; delete this.gridHover[0].dataset[id];
} }
var node = document.elementFromPoint(x,y); var node = document.elementFromPoint(x,y);
var $node = $j(node);
// Ignore high level & non-time (grid itself, header parent & week label) // Ignore high level & non-time (grid itself, header parent & week label)
if([this.node, this.gridHeader[0], this._labelContainer[0]].indexOf(node) !== -1 || if([this.node, this.gridHeader[0], this._labelContainer[0]].indexOf(node) !== -1 ||
// Day labels // Day labels
this.gridHeader.has(node).length && !$j(node).hasClass("calendar_calDayColAllDay")) this.gridHeader.has(node).length && !$node.hasClass("calendar_calDayColAllDay") && !$node.hasClass('calendar_calDayColHeader'))
{ {
return []; return [];
} }
@ -1721,7 +1722,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
{ {
path.push(node); path.push(node);
node.style.display = 'none'; node.style.display = 'none';
var $node = $j(node); $node = $j(node);
if($node.hasClass('calendar_calDayColHeader')) { if($node.hasClass('calendar_calDayColHeader')) {
for(var id in node.dataset) { for(var id in node.dataset) {
this.gridHover[0].dataset[id] = node.dataset[id]; this.gridHover[0].dataset[id] = node.dataset[id];