allow arbitrary subdirectories in image-name

This commit is contained in:
ralf 2024-08-28 14:51:54 +02:00
parent 0465465fb2
commit 0eec0297e6

View File

@ -78,12 +78,12 @@ egw.extend('images', egw.MODULE_GLOBAL, function()
// 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); var split = _name.match(/^([^/]+)\/(.*)$/);
// dhtmlxtree and egw_action are subdirs in image dir, not applications // e.g. dhtmlxtree and egw_action are subdirs in image dir, not applications
if (split[0] !== 'dhtmlxtree' && split[0] !== 'egw_action') if (typeof images[split[1]] !== 'undefined')
{ {
_app = split[0]; _app = split[1];
_name = split[1]; _name = split[2];
} }
} }