extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix framework wrong window opener in openPopup

Browse Source
This commit is contained in:
Hadi Nategh 2014-12-02 11:18:12 +00:00
parent 668ccafe36
commit 90afd04015
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/js/framework/fw_base.js
View File

@ -737,12 +737,13 @@ var fw_base = Class.extend({
* @param {string|boolean} _app app-name for framework to set correct opener or false for current app * @param {string|boolean} _app app-name for framework to set correct opener or false for current app
* @param {boolean} _returnID true: return window, false: return undefined * @param {boolean} _returnID true: return window, false: return undefined
* @param {type} _status "yes" or "no" to display status bar of popup * @param {type} _status "yes" or "no" to display status bar of popup
* @param {DOMWindow} _parentWnd parent window
* @returns {DOMWindow|undefined} * @returns {DOMWindow|undefined}
*/ */
openPopup: function(_url, _width, _height, _windowName, _app, _returnID, _status) openPopup: function(_url, _width, _height, _windowName, _app, _returnID, _status, _parentWnd)
{ {
//Determine the window the popup should be opened in - normally this is the iframe of the currently active application //Determine the window the popup should be opened in - normally this is the iframe of the currently active application
var parentWindow = window; var parentWindow = _parentWnd || window;
var navigate = false; var navigate = false;
if (typeof _app != 'undefined' && _app !== false) if (typeof _app != 'undefined' && _app !== false)
{ {
@ -758,7 +759,7 @@ var fw_base = Class.extend({
var appEntry = framework.activeApp; var appEntry = framework.activeApp;
} }
if (appEntry != null && appEntry.browser.iframe != null) if (appEntry != null && appEntry.browser.iframe != null && (_app || !egw(parentWindow).is_popup()))
parentWindow = appEntry.browser.iframe.contentWindow; parentWindow = appEntry.browser.iframe.contentWindow;
var windowID = egw(parentWindow).openPopup(_url, _width, _height, _windowName, _app, true, _status, true); var windowID = egw(parentWindow).openPopup(_url, _width, _height, _windowName, _app, true, _status, true);