app.js

nathangray 2016-03-15 16:51:10 UTC #1

Author: nathangray
New Revision: 55397

URL: http://svn.stylite.de/viewvc/egroupware?rev=55397&view=rev
Log:
Stop calendar activating when an infolog is added, while still allowing a refresh

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=55397&r1=55396&r2=55397&view=diff

— trunk/calendar/js/app.js (original)
+++ trunk/calendar/js/app.js Tue Mar 15 17:51:10 2016
@@ -1641,6 +1641,13 @@
}
if(changed.length && !this.state_update_in_progress)
{

  	// This activates calendar app if you call setState from a different app

  	// such as home.  If we change state while not active, sizing is wrong.

  	if(framework && framework.applications.calendar && framework.applications.calendar.hasSideboxMenuContent)

```
  	{
```

  		framework.setActiveApp(framework.applications.calendar);

```
  	}
```

  	console.log('Calendar state changed',changed.join("\n"));
  	// Log
  	this.egw.debug('navigation','Calendar state changed', changed.join("\n"));

@@ -1708,11 +1715,6 @@
*/
setState: function setState(state)
{

  if(framework && framework.applications.calendar && framework.applications.calendar.hasSideboxMenuContent)

```
  {
```

  	framework.setActiveApp(framework.applications.calendar);

```
  }
```

  // State should be an object, not a string, but we'll parse
  if(typeof state == "string")
  {

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

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