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

Return the promise if available

Browse Source
This commit is contained in:
nathangray 2019-01-10 14:21:05 -07:00
parent 45180fa2d2
commit 511b2c2b20
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/js/framework/fw_base.js
View File

@ -726,10 +726,9 @@ var fw_base = (function(){ "use strict"; return Class.extend(
if (_app != this.activeApp) if (_app != this.activeApp)
{ {
// tab not yet loaded, load it now // tab not yet loaded, load it now
if (!_app.browser.currentLocation && !_app.browser.iframe) if (!_app.browser || !_app.browser.currentLocation && !_app.browser.iframe)
{ {
this.applicationTabNavigate(_app, _app.indexUrl); return this.applicationTabNavigate(_app, _app.indexUrl);
return;
} }
this.activeApp = _app; this.activeApp = _app;

4
api/js/framework/fw_desktop.js
View File

@ -269,7 +269,7 @@
*/ */
setActiveApp: function(_app) setActiveApp: function(_app)
{ {
this._super.apply(this, arguments); var result = this._super.apply(this, arguments);
if (_app == _app.parentFw.activeApp) if (_app == _app.parentFw.activeApp)
{ {
@ -296,6 +296,8 @@
framework.getToggleSidebarState(); framework.getToggleSidebarState();
framework.activeApp.browser.callResizeHandler(); framework.activeApp.browser.callResizeHandler();
} }
return result;
}, },
/** /**