holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure windows.opener has egw object, fixes not able to open calendar entry

Browse Source
This commit is contained in:
Hadi Nategh 2016-04-29 08:37:33 +00:00
parent 0eb3619cd1
commit bd59406191
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/et2_widget_event.js
View File

@ -977,7 +977,7 @@ et2_calendar_event.recur_prompt = function(event_data, callback, extra_data)
{
var edit_id = event_data.app_id;
var edit_date = event_data.start;
var egw = this.egw ? (typeof this.egw == 'function' ? this.egw() : this.egw) : (window.opener || 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');
var that = this;
var extra_params = extra_data && typeof extra_data == 'object' ? extra_data : {};
@ -1041,7 +1041,7 @@ et2_calendar_event.recur_prompt = function(event_data, callback, extra_data)
*/
et2_calendar_event.series_split_prompt = function(event_data, instance_date, callback)
{
var egw = this.egw ? (typeof this.egw == 'function' ? this.egw() : this.egw) : (window.opener || 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');
var that = this;
if(typeof instance_date == 'string')