diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
index 38820999192..ebdc7647055 100644
--- a/tests/unit/button/button.html
+++ b/tests/unit/button/button.html
@@ -68,6 +68,7 @@
+
diff --git a/tests/unit/button/button_events.js b/tests/unit/button/button_events.js
index 7b79c41ea21..26fb3ab24a8 100644
--- a/tests/unit/button/button_events.js
+++ b/tests/unit/button/button_events.js
@@ -23,4 +23,16 @@ test( "when button loses focus, ensure active state is removed (#8559)", functio
}).focus().simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } ).simulate( "keypress", { keyCode: $.ui.keyCode.ENTER } );
});
+test( "ensure checked and aria after single click on checkbox label button", function() {
+ expect( 3 );
+
+ $( "#check2" ).button().change( function() {
+ var lbl = $( this ).button( "widget" );
+ ok( this.checked, "checked ok" );
+ ok( lbl.attr( "aria-pressed" ) === "true", "aria ok" );
+ ok( lbl.hasClass( "ui-state-active" ), "ui-state-active ok" );
+ }).button( "widget" ).simulate( "click" );
+
+});
+
})(jQuery);
diff --git a/tests/visual/button/tickets.html b/tests/visual/button/tickets.html
new file mode 100644
index 00000000000..ba9b2153c08
--- /dev/null
+++ b/tests/visual/button/tickets.html
@@ -0,0 +1,26 @@
+
+
+
+
+ Button Visual Test: Tickets
+
+
+
+
+
+
+
+
+ #5518 - Incorrect state after double click in Firefox
+
+ Checked state:
+ Aria state:
+
+
diff --git a/tests/visual/index.html b/tests/visual/index.html
index d8c8751f6ee..17ddd382d40 100644
--- a/tests/visual/index.html
+++ b/tests/visual/index.html
@@ -29,6 +29,7 @@ Button
Dialog
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index d6eed67dcc2..d630b6f06ad 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -147,8 +147,9 @@ $.widget( "ui.button", {
if ( options.disabled || clickDragged ) {
return false;
}
- $( this ).toggleClass( "ui-state-active" );
- that.buttonElement.attr( "aria-pressed", that.element[0].checked );
+ // Fix #5518 - let change handler handle display and aria update
+ //$( this ).toggleClass( "ui-state-active" );
+ //that.buttonElement.attr( "aria-pressed", that.element[0].checked );
});
} else if ( this.type === "radio" ) {
this.buttonElement.bind( "click" + this.eventNamespace, function() {