extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:12:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed popup detection to deal with main EGw window opened with an opener from a different security context, also made is_popup() a global egw method

Browse Source
This commit is contained in:
Ralf Becker 2014-02-10 11:21:58 +00:00
parent 3a8dacd710
commit 061a1a07f2
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
phpgwapi/js/jsapi/egw_message.js
View File

@ -34,16 +34,6 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
jQuery('div#egw_message').remove(); jQuery('div#egw_message').remove();
}); });
/**
* Are we running in a popup
*
* @returns {boolean} true: popup, false: main window
*/
function is_popup()
{
return !_wnd.framework || _wnd.opener;
}
return { return {
/** /**
* Display an error or regular message * Display an error or regular message
@ -63,7 +53,7 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
} }
// if we are NOT in a popup and have a framwork --> let it deal with it // if we are NOT in a popup and have a framwork --> let it deal with it
if (!is_popup() && typeof framework.setMessage != 'undefined') if (!this.is_popup() && typeof framework != 'undefined')
{ {
// currently not using framework, but top windows message // currently not using framework, but top windows message
//framework.setMessage.call(framework, _msg, _type); //framework.setMessage.call(framework, _msg, _type);
@ -104,6 +94,26 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
} }
}, },
/**
* Are we running in a popup
*
* @returns {boolean} true: popup, false: main window
*/
is_popup: function ()
{
var popup = false;
try {
if (_wnd.opener && typeof _wnd.opener.top.egw == 'object')
{
popup = true;
}
}
catch(e) {
// ignore SecurityError exception if opener is different security context / cross-origin
}
return popup;
},
/** /**
* Active app independent if we are using a framed template-set or not * Active app independent if we are using a framed template-set or not
* *
@ -111,7 +121,7 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
*/ */
app_name: function() app_name: function()
{ {
return !is_popup() && _wnd.framework ? _wnd.framework.activeApp.appName : _wnd.egw_appName; return !this.is_popup() && _wnd.framework ? _wnd.framework.activeApp.appName : _wnd.egw_appName;
}, },
/** /**
@ -122,7 +132,7 @@ egw.extend('message', egw.MODULE_WND_LOCAL, function(_app, _wnd)
*/ */
app_header: function(_header,_app) app_header: function(_header,_app)
{ {
if (!is_popup()) // not for popups if (!this.is_popup() && _wnd.framework) // not for popups and only for framed templates
{ {
var app = _app || this.app_name(); var app = _app || this.app_name();
var title = _wnd.document.title.replace(/[.*]$/, '['+_header+']'); var title = _wnd.document.title.replace(/[.*]$/, '['+_header+']');