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

diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index d2458aa3ca1d380d08756873a683157657d45b0e..134dae3d370e1fbcd79bca4433448461e9fbc2ce 100644 (file)
--- a/ui/jquery.ui.button.js
+++ b/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 );