forked from extern/egroupware
Show toolbar's action always with icon and caption when it is in menulist
This commit is contained in:
parent
338c1c1f2f
commit
5886ec65a3
@ -274,17 +274,16 @@ var et2_toolbar = et2_DOMWidget.extend(
|
||||
.attr('title', action.caption)
|
||||
.appendTo(this.preference[action.id]?this.actionbox.children()[1]:$j('[data-group='+action.group+']',this.actionlist));
|
||||
|
||||
if ( action.iconUrl && this.countActions > this.view_range )
|
||||
if ( action.iconUrl)
|
||||
{
|
||||
button.attr('style','background-image:url(' + action.iconUrl + ')');
|
||||
}
|
||||
else if (action.caption)
|
||||
if (action.caption)
|
||||
{
|
||||
if (action.iconUrl)
|
||||
if (this.countActions <= this.view_range || this.preference[action.id] )
|
||||
{
|
||||
button.attr('style','background-image:url(' + action.iconUrl + ')');
|
||||
button.context.innerText = action.caption;
|
||||
}
|
||||
button.context.innerText = action.caption;
|
||||
}
|
||||
if(action.icon)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user