js: app.js et2_widget_timegrid.js

nathangray 2016-04-06 22:23:44 UTC #1

Author: nathangray
New Revision: 55661

URL: http://svn.stylite.de/viewvc/egroupware?rev=55661&view=rev
Log:

Fix loading overlay on home was not removed
Fix missing initial data on home

Modified:
trunk/calendar/js/app.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=55661&r1=55660&r2=55661&view=diff

— trunk/calendar/js/app.js (original)
+++ trunk/calendar/js/app.js Thu Apr 7 00:23:43 2016
@@ -149,7 +149,11 @@
this._super.apply(this, arguments);

	// Avoid many problems with home

```
  if(_et2.app !== 'calendar') return;
```

```
  if(_et2.app !== 'calendar')
```
```
  {
```

  	egw.loading_prompt(this.appname,false);

```
  	return;
```

  }

  // Re-init sidebox, since it was probably initialized too soon
  var sidebox = jQuery('#favorite_sidebox_'+this.appname);

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

— trunk/calendar/js/et2_widget_timegrid.js (original)
+++ trunk/calendar/js/et2_widget_timegrid.js Thu Apr 7 00:23:43 2016
@@ -899,7 +899,8 @@
day = this.day_widgets[i];

		// Classes

  	if(this.day_list[i] && parseInt(this.day_list[i].substr(4,2)) !== new Date(app.calendar.state.date).getUTCMonth()+1)

  	if(app.calendar && app.calendar.state &&

  		this.day_list[i] && parseInt(this.day_list[i].substr(4,2)) !== new Date(app.calendar.state.date).getUTCMonth()+1)
  	{
  		day.set_class('calendar_differentMonth');
  	}

@@ -1349,34 +1350,26 @@
this.set_end_date(day_list[day_list.length-1]);
}

  	// We need to check if we're attached already, as the datastore can cause

  	// conflicts across other events (especially home) if we call it too early

```
  	if(this.isAttached())
```
```
  	{
```

  		// Sub widgets actually get their own data from egw.data, so we'll

```
  		// stick it there
```

  		var consolidated = et2_calendar_view.is_consolidated(this.options.owner, this.day_list.length == 1 ? 'day' : 'week');

```
  		for(var day in events)
```
```
  		{
```
```
  			var day_list = [];
```

  			for(var i = 0; i < events[day].length; i++)

```
  			{
```

  				day_list.push(events[day][i].row_id);

  				egw.dataStoreUID('calendar::'+events[day][i].row_id, events[day][i]);

```
  			}
```

  			// Might be split by user, so we have to check that too

  			for(var i = 0; i < this.options.owner.length; i++)

```
  			{
```

  				var owner = consolidated ? this.options.owner : this.options.owner[i];

  				var day_id = app.classes.calendar._daywise_cache_id(day,owner);

  				egw.dataStoreUID(day_id, day_list);

```
  				if(consolidated) break;
```
```
  			}
```
```
  		}
```
```
  	}
```
```
  	else
```
```
  	{
```
```
  		this.value = events;
```

  	// Sub widgets actually get their own data from egw.data, so we'll

```
  	// stick it there
```

  	var consolidated = et2_calendar_view.is_consolidated(this.options.owner, this.day_list.length == 1 ? 'day' : 'week');

```
  	for(var day in events)
```
```
  	{
```
```
  		var day_list = [];
```

  		for(var i = 0; i < events[day].length; i++)

```
  		{
```

  			day_list.push(events[day][i].row_id);

  			egw.dataStoreUID('calendar::'+events[day][i].row_id, events[day][i]);

```
  		}
```

  		// Might be split by user, so we have to check that too

  		for(var i = 0; i < this.options.owner.length; i++)

```
  		{
```

  			var owner = consolidated ? this.options.owner : this.options.owner[i];

  			var day_id = app.classes.calendar._daywise_cache_id(day,owner);

  			egw.dataStoreUID(day_id, day_list);

```
  			if(consolidated) break;
```
```
  		}
  	}
  }
```

@@ -1429,7 +1422,9 @@
this.owner.set_value(’’);
if(this.options.start_date)
{

  		this.set_label(egw.lang('wk') + ' ' +app.calendar.date.week_number(this.options.start_date));

  		this.set_label(egw.lang('wk') + ' ' +

  			(app.calendar ? app.calendar.date.week_number(this.options.start_date) : '')

```
  		);
  	}
  }
  else
```

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