From 6c03b0ec39affeef713d90f3efa74b703be8fb58 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 12 Dec 2012 19:45:27 +0000 Subject: [PATCH] Try to avoid conflicts between framework's egw_appWindow() & jsapi's egw_appWindow() --- phpgwapi/js/jsapi/jsapi.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpgwapi/js/jsapi/jsapi.js b/phpgwapi/js/jsapi/jsapi.js index 35cd744451..2b025d5092 100644 --- a/phpgwapi/js/jsapi/jsapi.js +++ b/phpgwapi/js/jsapi/jsapi.js @@ -174,6 +174,8 @@ function egw_topWindow() */ function egw_appWindow(_app) { + var framework = egw_getFramework(); + if(framework && framework.egw_appWindow) return framework.egw_appWindow(_app); return window; } @@ -284,7 +286,7 @@ window.egw_getFramework = function() { 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(); }