js: app.js et2_widget_daycol.js et2_widget_timegrid.js

nathangray 2016-03-09 18:10:44 UTC #1

Author: nathangray
New Revision: 55337

URL: http://svn.stylite.de/viewvc/egroupware?rev=55337&view=rev
Log:
Add some missed cases for adding new events:

click on day in month view
context menu with no specific time (month view)
fix all day non-blocking in header no longer created a new event

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

Modified: trunk/calendar/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/app.js?rev=55337&r1=55336&r2=55337&view=diff

— trunk/calendar/js/app.js (original)
+++ trunk/calendar/js/app.js Wed Mar 9 19:10:43 2016
@@ -1322,7 +1322,7 @@
// Get a little smarter with the context
if(!extra)
{

```
  		var context = {}
```

  		var context = {};
  		if(egw.dataGetUIDdata(_events[0].id) && egw.dataGetUIDdata(_events[0].id).data)
  		{
  			// Found data in global cache

@@ -1336,6 +1336,17 @@
_events[0].iface.getWidget().getValue() :
_events[0].iface.getWidget().options.value || {}
extra = {};

```
  		}
```

  		// Try to pull whatever we can from the event

  		else if (jQuery.isEmptyObject(context) && _action.menu_context && (_action.menu_context.event.target))

```
  		{
```

  			var target = _action.menu_context.event.target;

  			while(target != null && target.parentNode && jQuery.isEmptyObject(target.dataset))

```
  			{
```
```
  				target = target.parentNode;
```
```
  			}
```

  			context = extra = target.dataset;
  		}
  		if(context.date) extra.date = context.date;
  		if(context.app) extra.app = context.app;

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

— trunk/calendar/js/et2_widget_daycol.js (original)
+++ trunk/calendar/js/et2_widget_daycol.js Wed Mar 9 19:10:43 2016
@@ -1012,7 +1012,7 @@
return false;
}
// Header, but not the hidden event indicators that are in there

  else if (this.header.has(_ev.target).length && !$j('.hiddenEventBefore',this.header).has(_ev.target) ||

  else if (this.header.has(_ev.target).length && !$j('.hiddenEventBefore',this.header).has(_ev.target).length ||
  	this.header.is(_ev.target)
  )
  {

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

— trunk/calendar/js/et2_widget_timegrid.js (original)
+++ trunk/calendar/js/et2_widget_timegrid.js Wed Mar 9 19:10:43 2016
@@ -1643,6 +1643,25 @@
}
}
}

```
  // No time grid, click on a day
```

  else if (this.options.granularity === 0 &&

  	($j(_ev.target).hasClass('event_wrapper') || $j(_ev.target).hasClass('.calendar_calDayCol'))

```
  )
```
```
  {
```

  	// Default handler to open a new event at the selected time

  	var target = $j(_ev.target).hasClass('event_wrapper') ? _ev.target.parentNode : _ev.target;

```
  	var options = {
```

  		date: target.dataset.date || this.options.date,

  		hour: target.dataset.hour || this._parent.options.day_start,

```
  		minute: target.dataset.minute || 0
```
```
  	};
```

  	if (this.options.owner != app.calendar.state.owner)

```
  	{
```

  		options.owner = this.options.owner;

```
  	}
```

  	this.egw().open(null, 'calendar', 'add', options, '_blank');

```
  	return false;
```
```
  }
```
},

/**

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785111&iu=/4140

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