extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 08:53:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: Fix opening a calendar entry sometimes doesn't work

Browse Source
This commit is contained in:
Hadi Nategh 2016-07-22 12:21:14 +02:00
parent 900c0ba99e
commit 51e41012e3
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
calendar/js/et2_widget_event.js
View File

@ -999,7 +999,16 @@ et2_calendar_event.recur_prompt = function(event_data, callback, extra_data)
{ {
var edit_id = event_data.app_id; var edit_id = event_data.app_id;
var edit_date = event_data.start; var edit_date = event_data.start;
// seems window.opener somehow in certian conditions could be from different origin
// we try to catch the exception and in this case retrive the egw object from current window.
try {
var egw = this.egw ? (typeof this.egw == 'function' ? this.egw() : this.egw) : window.opener && typeof window.opener.egw != 'undefined' ? window.opener.egw('calendar'):window.egw('calendar'); var egw = this.egw ? (typeof this.egw == 'function' ? this.egw() : this.egw) : window.opener && typeof window.opener.egw != 'undefined' ? window.opener.egw('calendar'):window.egw('calendar');
}
catch(e){
var egw = window.egw('calendar');
}
var that = this; var that = this;
var extra_params = extra_data && typeof extra_data == 'object' ? extra_data : {}; var extra_params = extra_data && typeof extra_data == 'object' ? extra_data : {};
@ -1063,7 +1072,15 @@ et2_calendar_event.recur_prompt = function(event_data, callback, extra_data)
*/ */
et2_calendar_event.series_split_prompt = function(event_data, instance_date, callback) et2_calendar_event.series_split_prompt = function(event_data, instance_date, callback)
{ {
// seems window.opener somehow in certian conditions could be from different origin
// we try to catch the exception and in this case retrive the egw object from current window.
try {
var egw = this.egw ? (typeof this.egw == 'function' ? this.egw() : this.egw) : window.opener && typeof window.opener.egw != 'undefined' ? window.opener.egw('calendar'):window.egw('calendar'); var egw = this.egw ? (typeof this.egw == 'function' ? this.egw() : this.egw) : window.opener && typeof window.opener.egw != 'undefined' ? window.opener.egw('calendar'):window.egw('calendar');
}
catch(e){
var egw = window.egw('calendar');
}
var that = this; var that = this;
if(typeof instance_date == 'string') if(typeof instance_date == 'string')