extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 03:13:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stop calendar activating when an infolog is added, while still allowing a refresh

Browse Source
This commit is contained in:
Nathan Gray 2016-03-15 16:51:10 +00:00
parent d20873b881
commit e76fa3aa16
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/js/app.js
View File

@ -1641,6 +1641,13 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
} }
if(changed.length && !this.state_update_in_progress) 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")); console.log('Calendar state changed',changed.join("\n"));
// Log // Log
this.egw.debug('navigation','Calendar state changed', changed.join("\n")); this.egw.debug('navigation','Calendar state changed', changed.join("\n"));
@ -1708,11 +1715,6 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
*/ */
setState: function setState(state) 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 // State should be an object, not a string, but we'll parse
if(typeof state == "string") if(typeof state == "string")
{ {