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

12
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
{ {
@ -551,11 +551,11 @@ app.classes.calendar = AppJS.extend(
that.egw.open_link(link,'_blank',windowSize); that.egw.open_link(link,'_blank',windowSize);
return false; return false;
}); });
//******************************** Calendar Sortable ************************ //******************************** Calendar Sortable ************************
// Calender current state // Calender current state
var state = this.getState(); var state = this.getState();
if (state && state.view === "day" if (state && state.view === "day"
&& typeof state.owner != 'undefined' && typeof state.owner != 'undefined'
&& state.owner.split(',').length > 1) && state.owner.split(',').length > 1)
@ -568,7 +568,7 @@ app.classes.calendar = AppJS.extend(
jQuery(this).css({position:"relative",display:"inline-block", left:"none"}); jQuery(this).css({position:"relative",display:"inline-block", left:"none"});
}); });
} }
$iframeBody.find('.cal_is_sortable').sortable ({ $iframeBody.find('.cal_is_sortable').sortable ({
cancel: "#divAppboxHeader, .calendar_calWeekNavHeader, .calendar_plannerHeader", cancel: "#divAppboxHeader, .calendar_calWeekNavHeader, .calendar_plannerHeader",
placeholder: "srotable_cal_wk_ph", placeholder: "srotable_cal_wk_ph",
@ -783,7 +783,7 @@ app.classes.calendar = AppJS.extend(
var start = this.et2.getWidgetById('start'); var start = this.et2.getWidgetById('start');
var end = this.et2.getWidgetById('end'); var end = this.et2.getWidgetById('end');
var content = this.et2.getArrayMgr('content').data; var content = this.et2.getArrayMgr('content').data;
if (typeof duration != 'undefined' && typeof end != 'undefined') if (typeof duration != 'undefined' && typeof end != 'undefined')
{ {
end.set_disabled(duration.get_value()!==''); end.set_disabled(duration.get_value()!=='');