js: et2_widget_daycol.js et2_widget_timegrid.js

nathangray 2016-04-27 22:23:08 UTC #1

Author: nathangray
New Revision: 55908

URL: http://svn.stylite.de/viewvc/egroupware?rev=55908&view=rev
Log:
Fix all day non-blocking overflow calculation causing false positives

Modified:
trunk/calendar/js/et2_widget_daycol.js
trunk/calendar/js/et2_widget_timegrid.js

Modified: trunk/calendar/js/et2_widget_daycol.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_daycol.js?rev=55908&r1=55907&r2=55908&view=diff

— trunk/calendar/js/et2_widget_daycol.js (original)
+++ trunk/calendar/js/et2_widget_daycol.js Thu Apr 28 00:23:06 2016
@@ -569,7 +569,7 @@
}
// Check all day overflow
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

@@ -1000,7 +1000,7 @@
// Click on the title
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
  		var options = {

Modified: trunk/calendar/js/et2_widget_timegrid.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_timegrid.js?rev=55908&r1=55907&r2=55908&view=diff

— trunk/calendar/js/et2_widget_timegrid.js (original)
+++ trunk/calendar/js/et2_widget_timegrid.js Thu Apr 28 00:23:06 2016
@@ -1708,11 +1708,12 @@
delete this.gridHover[0].dataset[id];
}
var node = document.elementFromPoint(x,y);

  var $node = $j(node);

  // Ignore high level & non-time (grid itself, header parent & week label)
  if([this.node, this.gridHeader[0], this._labelContainer[0]].indexOf(node) !== -1 ||
  	// 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 [];
  }

@@ -1721,7 +1722,7 @@
{
path.push(node);
node.style.display = ‘none’;

```
  	var $node = $j(node);
```

  	$node = $j(node);
  	if($node.hasClass('calendar_calDayColHeader')) {
  		for(var id in node.dataset) {
  			this.gridHover[0].dataset[id] = node.dataset[id];

Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs