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

Timestamp:

Feb 18, 2013, 10:18:40 PM (11 years ago)

Author:

rvelices

Message:

upgraded jquery ui from 1.9.0 to 1.10.1

File:

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

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

@@ -1 +1 @@
 /*!
- * jQuery UI Button 1.9.0
+ * jQuery UI Button 1.10.1
  * http://jqueryui.com
  *
- * Copyright 2012 jQuery Foundation and other contributors
+ * Copyright 2013 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
@@ -30 +30 @@
                         radios = $( [] );
                 if ( name ) {
+                        name = name.replace( /'/g, "\\'" );
                         if ( form ) {
                                 radios = $( form ).find( "[name='" + name + "']" );
@@ -43 +44 @@
 
 $.widget( "ui.button", {
-        version: "1.9.0",
+        version: "1.10.1",
         defaultElement: "<button>",
         options: {
@@ -71 +72 @@
                         options = this.options,
                         toggleButton = this.type === "checkbox" || this.type === "radio",
-                        hoverClass = "ui-state-hover" + ( !toggleButton ? " ui-state-active" : "" ),
+                        activeClass = !toggleButton ? "ui-state-active" : "",
                         focusClass = "ui-state-focus";
 
@@ -77 +78 @@
                         options.label = (this.type === "input" ? this.buttonElement.val() : this.buttonElement.html());
                 }
+
+                this._hoverable( this.buttonElement );
 
                 this.buttonElement
@@ -85 +88 @@
                                         return;
                                 }
-                                $( this ).addClass( "ui-state-hover" );
                                 if ( this === lastActive ) {
                                         $( this ).addClass( "ui-state-active" );
@@ -94 +96 @@
                                         return;
                                 }
-                                $( this ).removeClass( hoverClass );
+                                $( this ).removeClass( activeClass );
                         })
                         .bind( "click" + this.eventNamespace, function( event ) {
@@ -146 +148 @@
                                         return false;
                                 }
-                                $( this ).toggleClass( "ui-state-active" );
-                                that.buttonElement.attr( "aria-pressed", that.element[0].checked );
                         });
                 } else if ( this.type === "radio" ) {
@@ -192 +192 @@
                                         }
                                 })
-                                .bind( "keyup" + this.eventNamespace, function() {
+                                // see #8559, we bind to blur here in case the button element loses
+                                // focus between keydown and keyup, it would be left in an "active" state
+                                .bind( "keyup" + this.eventNamespace + " blur" + this.eventNamespace, function() {
                                         $( this ).removeClass( "ui-state-active" );
                                 });
@@ -283 +285 @@
 
         refresh: function() {
-                var isDisabled = this.element.is( ":disabled" );
+                //See #8237 & #8828
+                var isDisabled = this.element.is( "input, button" ) ? this.element.is( ":disabled" ) : this.element.hasClass( "ui-button-disabled" );
+
                 if ( isDisabled !== this.options.disabled ) {
                         this._setOption( "disabled", isDisabled );
@@ -357 +361 @@
 
 $.widget( "ui.buttonset", {
-        version: "1.9.0",
+        version: "1.10.1",
         options: {
-                items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(button)"
+                items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
         },