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

Framework WIP:

Browse Source 
- Fix unable to open account
This commit is contained in:
nathan 2024-06-17 15:18:51 -06:00
parent 485ebf2cc3
commit 47a8519767
1 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
kdots/js/EgwFramework.ts
View File

@ -384,16 +384,6 @@ export class EgwFramework extends LitElement
let tabApps = {...this.tabApps}; let tabApps = {...this.tabApps};
tabApps[appname] = clone; tabApps[appname] = clone;
this.tabApps = tabApps; 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); this.loadApp(appname, true);
return appname; return appname;
@ -420,38 +410,10 @@ export class EgwFramework extends LitElement
*/ */
public openPopup(_url, _width, _height, _windowName, _app, _returnID, _status, _parentWnd) 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 const windowID = this.egw.openPopup(_url, _width, _height, _windowName, _app, true, _status, true);
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);
windowID.framework = this; windowID.framework = this;
if(navigate)
{
window.setTimeout("framework.applicationTabNavigate(framework.activeApp, framework.activeApp.indexUrl);", 500);
}
if(_returnID !== false) if(_returnID !== false)
{ {
return windowID; return windowID;