Skip to content
Permalink
Browse files

Button: Only add text classes if there is text. Fixes #7040 - button …

…class change breaks icon only buttons.
  • Loading branch information...
scottgonzalez committed Feb 26, 2011
1 parent 260a644 commit e72afe4afca0795fc785114cfeafbe08f5e2fdf3
Showing with 3 additions and 2 deletions.
  1. +3 −2 ui/jquery.ui.button.js
@@ -293,7 +293,9 @@ $.widget( "ui.button", {
buttonClasses = [];

if ( icons.primary || icons.secondary ) {
buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
if ( this.options.text ) {
buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
}

if ( icons.primary ) {
buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
@@ -305,7 +307,6 @@ $.widget( "ui.button", {

if ( !this.options.text ) {
buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
buttonElement.removeClass( "ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary" );

if ( !this.hasTitle ) {
buttonElement.attr( "title", buttonText );

0 comments on commit e72afe4

Please sign in to comment.
You can’t perform that action at this time.