From 47a8519767a5f7c8efb425dbf4da949fd1c3d430 Mon Sep 17 00:00:00 2001 From: nathan Date: Mon, 17 Jun 2024 15:18:51 -0600 Subject: [PATCH] Framework WIP: - Fix unable to open account --- kdots/js/EgwFramework.ts | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/kdots/js/EgwFramework.ts b/kdots/js/EgwFramework.ts index e9a8ae25de..af588e97c4 100644 --- a/kdots/js/EgwFramework.ts +++ b/kdots/js/EgwFramework.ts @@ -384,16 +384,6 @@ export class EgwFramework extends LitElement let tabApps = {...this.tabApps}; tabApps[appname] = clone; this.tabApps = tabApps; - - /* ?? - this.applications[appname]['sidemenuEntry'] = this.sidemenuUi.addEntry( - this.applications[appname].displayName, this.applications[appname].icon, - function() - { - self.applicationTabNavigate(self.applications[appname], _link, false, -1, null); - }, this.applications[appname], appname); - - */ this.loadApp(appname, true); return appname; @@ -420,38 +410,10 @@ export class EgwFramework extends LitElement */ public openPopup(_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 - let parentWindow = _parentWnd || window; - let navigate = false; - let appEntry = null; - if(typeof _app != 'undefined' && _app !== false) - { - appEntry = this.getApplicationByName(_app); - if(appEntry && appEntry.browser == null) - { - navigate = true; - this.applicationTabNavigate(appEntry, appEntry.indexUrl); - } - } - else - { - appEntry = this.activeApp; - } - - if(appEntry != null && appEntry.useIframe && (_app || !egw(parentWindow).is_popup())) - { - parentWindow = appEntry.iframe.contentWindow; - } - - const windowID = egw(parentWindow).openPopup(_url, _width, _height, _windowName, _app, true, _status, true); + const windowID = this.egw.openPopup(_url, _width, _height, _windowName, _app, true, _status, true); windowID.framework = this; - if(navigate) - { - window.setTimeout("framework.applicationTabNavigate(framework.activeApp, framework.activeApp.indexUrl);", 500); - } - if(_returnID !== false) { return windowID;