holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- if image not found, check if it might contain extension and try without (better is not to use extension at all!)

Browse Source 
- changed default to current app as in API, but it is not yet working, because egw object runs in framework for jdots :-(
This commit is contained in:
Ralf Becker 2011-08-31 06:26:05 +00:00
parent 114debd00f
commit 1e7b17203f
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
phpgwapi/js/jsapi/egw.js
View File

@ -329,12 +329,12 @@ else
* Get image URL for a given image-name and application * Get image URL for a given image-name and application
* *
* @param string _name image-name without extension * @param string _name image-name without extension
* @param string _app application name, default phpgwapi * @param string _app application name, default current app of window
* @return string with URL of image * @return string with URL of image
*/ */
image: function (_name, _app) image: function (_name, _app)
{ {
if (typeof _app == 'undefined') _app = 'phpgwapi'; if (typeof _app == 'undefined') _app = this.getAppName();
// own instance specific images in vfs have highest precedence // own instance specific images in vfs have highest precedence
if (typeof this.images['vfs'] != 'undefined' && typeof this.images['vfs'][_name] != 'undefined') if (typeof this.images['vfs'] != 'undefined' && typeof this.images['vfs'][_name] != 'undefined')
@ -349,8 +349,30 @@ else
{ {
return this.webserverUrl+this.images['vfs'][_name]; return this.webserverUrl+this.images['vfs'][_name];
} }
// if no match, check if it might contain an extension
if (_name.match(/\.(png|gif|jpg)$/i))
{
return this.image(_name.replace(/.(png|gif|jpg)$/i,''), _app);
}
console.log('egw.image("'+_name+'", "'+_app+'") image NOT found!'); console.log('egw.image("'+_name+'", "'+_app+'") image NOT found!');
return null; return null;
},
/**
* Returns the name of the currently active application
*
* @ToDo: fixme: does not work, as egw object runs in framework for jdots
*/
getAppName: function ()
{
if (typeof egw_appName == 'undefined')
{
return 'egroupware';
}
else
{
return egw_appName;
}
} }
}; };
} }