From ead0a507bfcbee85a5163a3f6e961b6abf5ae715 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 9 Mar 2015 18:18:52 +0000 Subject: [PATCH] Do not use iframe for popups from external links --- phpgwapi/js/framework/fw_browser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phpgwapi/js/framework/fw_browser.js b/phpgwapi/js/framework/fw_browser.js index 446ec8f7ef..4c589c620e 100644 --- a/phpgwapi/js/framework/fw_browser.js +++ b/phpgwapi/js/framework/fw_browser.js @@ -153,6 +153,11 @@ var fw_browser = Class.extend({ targetUrl = "index.php?menuaction=" + matches[1]; useIframe = false; } + // External link, but we'd still like to use everything without iframe + if(_url.indexOf('no_popup=1') > 0) + { + useIframe = false; + } // Destroy application js if(window.app[this.app.appName] && window.app[this.app.appName].destroy)