extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 12:21:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix toolbar actions not getting their icons displayed when the toolbar is being opened from its none origin apps

Browse Source
This commit is contained in:
hadi 2023-04-19 17:50:57 +02:00
parent aac751f864
commit 2e570a0343
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/egw_action/egw_action.js
View File

@ -415,7 +415,7 @@ egwAction.prototype.updateActions = function(_actions, _app)
if (typeof elem.icon == "undefined") elem.icon = this.defaultIcons[elem.id]; if (typeof elem.icon == "undefined") elem.icon = this.defaultIcons[elem.id];
if (typeof elem.icon != "undefined") if (typeof elem.icon != "undefined")
{ {
elem.iconUrl = egw.image(elem.icon); elem.iconUrl = egw.image(elem.icon, _app);
} }
delete elem.icon; delete elem.icon;
} }

18
api/js/jsapi/egw_images.js
View File

@ -73,17 +73,17 @@ egw.extend('images', egw.MODULE_GLOBAL, function()
// If the application name is not given, set it to the name of // If the application name is not given, set it to the name of
// current application // current application
_app = this.getAppName(); _app = this.getAppName();
}
// Handle images in appname/imagename format // Handle images in appname/imagename format
if(_name.indexOf('/') > 0) if(_name.indexOf('/') > 0)
{
var split = _name.split('/',2);
// dhtmlxtree and egw_action are subdirs in image dir, not applications
if (split[0] !== 'dhtmlxtree' && split[0] !== 'egw_action')
{ {
var split = _name.split('/',2); _app = split[0];
// dhtmlxtree and egw_action are subdirs in image dir, not applications _name = split[1];
if (split[0] !== 'dhtmlxtree' && split[0] !== 'egw_action')
{
_app = split[0];
_name = split[1];
}
} }
} }