Browse files

Button: use _hoverable for hover state management. Fixes #5295 - butt…

…on doesn't remove hover state if they are disabled

(cherry picked from commit 8e1ceba)
  • Loading branch information...
1 parent e27195b commit 85b5c5b5586af541291d52e5c52b9774e4ec2a22 @cgack cgack committed with scottgonzalez Jan 1, 2012
Showing with 15 additions and 3 deletions.
  1. +11 −0 tests/unit/button/button_tickets.js
  2. +4 −3 ui/jquery.ui.button.js
View
11 tests/unit/button/button_tickets.js
@@ -5,6 +5,17 @@
module( "button: tickets" );
+test( "#5295 - button does not remove hoverstate if disabled" , function() {
+ expect( 1 );
+ var btn = $("#button").button();
+ btn.hover( function() {
+ btn.button( "disable" );
+ });
+ btn.trigger( "mouseenter" );
+ btn.trigger( "mouseleave" );
+ ok( !btn.is( ".ui-state-hover") );
+});
+
test( "#5946 - buttonset should ignore buttons that are not :visible", function() {
expect( 2 );
$( "#radio01" ).next().andSelf().hide();
View
7 ui/jquery.ui.button.js
@@ -70,21 +70,22 @@ $.widget( "ui.button", {
var that = this,
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";
if ( options.label === null ) {
options.label = (this.type === "input" ? this.buttonElement.val() : this.buttonElement.html());
}
+ this._hoverable( this.buttonElement );
+
this.buttonElement
.addClass( baseClasses )
.attr( "role", "button" )
.bind( "mouseenter" + this.eventNamespace, function() {
if ( options.disabled ) {
return;
}
- $( this ).addClass( "ui-state-hover" );
if ( this === lastActive ) {
$( this ).addClass( "ui-state-active" );
}
@@ -93,7 +94,7 @@ $.widget( "ui.button", {
if ( options.disabled ) {
return;
}
- $( this ).removeClass( hoverClass );
+ $( this ).removeClass( activeClass );
})
.bind( "click" + this.eventNamespace, function( event ) {
if ( options.disabled ) {

0 comments on commit 85b5c5b

Please sign in to comment.