app.js

nathangray 2016-03-29 14:52:40 UTC #1

Author: nathangray
New Revision: 55559

URL: http://svn.stylite.de/viewvc/egroupware?rev=55559&view=rev
Log:
Fix 4 day view to follow week consolidation rules

Modified:
trunk/calendar/js/app.js

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

— trunk/calendar/js/app.js (original)
+++ trunk/calendar/js/app.js Tue Mar 29 16:52:40 2016
@@ -1852,9 +1852,9 @@
switch(state.state.view)
{
case ‘day’:

  		case 'day4':
  			grid_count = 1
  			break;

  		case 'day4':
  		case 'week':
  			grid_count = state.state.owner.length >= parseInt(this.egw.preference('week_consolidate','calendar')) ? 1 : state.state.owner.length;
  			break;

@@ -1879,7 +1879,10 @@
var date = new Date(state.state.first);

			// Hide all but the first day header

  		$j(grid.getDOMNode()).toggleClass('hideDayColHeader',state.state.view == 'week');

```
  		$j(grid.getDOMNode()).toggleClass(
```
```
  			'hideDayColHeader',
```

  			state.state.view == 'week' || state.state.view == 'day4'

  		);

  		// Determine the different end date & varying values
  		switch(state.state.view)

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=278785471&iu=/4140

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