extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-16 19:41:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try to avoid conflicts between framework's egw_appWindow() & jsapi's egw_appWindow()

Browse Source
This commit is contained in:
Nathan Gray
2012-12-12 19:45:27 +00:00
parent 4aae715fd7
commit 6c03b0ec39
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/js/jsapi/jsapi.js
View File

@ -174,6 +174,8 @@ function egw_topWindow()
*/ */
function egw_appWindow(_app) function egw_appWindow(_app)
{ {
var framework = egw_getFramework();
if(framework && framework.egw_appWindow) return framework.egw_appWindow(_app);
return window; return window;
} }
@ -284,7 +286,7 @@ window.egw_getFramework = function()
{ {
return framework; return framework;
} }
else if (typeof window.parent.egw_getFramework != "undefined") else if (typeof window.parent.egw_getFramework != "undefined" && window !== window.parent)
{ {
return window.parent.egw_getFramework(); return window.parent.egw_getFramework();
} }