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

Show toolbar's action always with icon and caption when it is in menulist

Browse Source
This commit is contained in:
Hadi Nategh 2014-02-06 14:01:37 +00:00
parent 338c1c1f2f
commit 5886ec65a3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/js/et2_widget_toolbar.js
View File

@ -274,17 +274,16 @@ var et2_toolbar = et2_DOMWidget.extend(
.attr('title', action.caption) .attr('title', action.caption)
.appendTo(this.preference[action.id]?this.actionbox.children()[1]:$j('[data-group='+action.group+']',this.actionlist)); .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 + ')'); 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) if(action.icon)
{ {