extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 11:51:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

do not destroy top-level app object, if we run in popup

Browse Source
This commit is contained in:
Ralf Becker 2014-11-27 17:37:18 +00:00
parent 3f8acc1fd1
commit 48c8b1de74
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/app.js
View File

@ -33,7 +33,7 @@ app.classes.calendar = AppJS.extend(
init: function() init: function()
{ {
// make calendar object available, even if not running in top window, as sidebox does // make calendar object available, even if not running in top window, as sidebox does
if (window.top !== window) if (window.top !== window && !egw(window).is_popup())
{ {
// we have to explicitly delete old object or IE11 complains about accessing an already freed script // we have to explicitly delete old object or IE11 complains about accessing an already freed script
delete window.top.app.calendar; delete window.top.app.calendar;
@ -181,7 +181,7 @@ app.classes.calendar = AppJS.extend(
{ {
// F.F can not handle to style correctly an iframe which is hidden (display:none), therefore we need to // F.F can not handle to style correctly an iframe which is hidden (display:none), therefore we need to
// bind a handler to refresh the calendar views after it shows up // bind a handler to refresh the calendar views after it shows up
iframe.one('show',function(){egw_refresh('','calendar');}) iframe.one('show',function(){egw_refresh('','calendar');});
} }
else else
{ {