Changeset 9559 for trunk/themes/default/js/ui/jquery.ui.button.js

Timestamp:

Mar 7, 2011, 1:58:34 AM (13 years ago)

Author:

patdenice

Message:

Update jQuery UI to 1.8.10.
Improve jquery ui management in template class.

File:

• trunk/themes/default/js/ui/jquery.ui.button.js (modified) (3 diffs)

trunk/themes/default/js/ui/jquery.ui.button.js

@@ -1 +1 @@
 /*
- * jQuery UI Button 1.8.9
+ * jQuery UI Button 1.8.10
  *
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
@@ -291 +291 @@
                                 .text(),
                         icons = this.options.icons,
-                        multipleIcons = icons.primary && icons.secondary;
+                        multipleIcons = icons.primary && icons.secondary,
+                        buttonClasses = [];  
+
                 if ( icons.primary || icons.secondary ) {
-                        buttonElement.addClass( "ui-button-text-icon" +
-                                ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+                        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>" );
                         }
+
                         if ( icons.secondary ) {
                                 buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
                         }
+
                         if ( !this.options.text ) {
-                                buttonElement
-                                        .addClass( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" )
-                                        .removeClass( "ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary" );
+                                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 );
@@ -310 +314 @@
                         }
                 } else {
-                        buttonElement.addClass( "ui-button-text-only" );
-                }
+                        buttonClasses.push( "ui-button-text-only" );
+                }
+                buttonElement.addClass( buttonClasses.join( " " ) );
         }
 });