Permalink
Browse files

Button: Remove obsolete mouse click coordinates checking. Fixed #7665…

… - Button: Radio button & checkboxes ignore mouseclicks for minor mouse movements.
  • Loading branch information...
UltCombo authored and scottgonzalez committed Oct 27, 2013
1 parent f16d0c7 commit 8b64322e982e97cdfd5cdd184c8993f7123d469e
Showing with 3 additions and 26 deletions.
  1. +3 −26 ui/jquery.ui.button.js
View
@@ -14,7 +14,7 @@
*/
(function( $, undefined ) {
var lastActive, startXPos, startYPos, clickDragged,
var lastActive,
baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
formResetHandler = function() {
@@ -115,42 +115,19 @@ $.widget( "ui.button", {
if ( toggleButton ) {
this.element.bind( "change" + this.eventNamespace, function() {
if ( clickDragged ) {
return;
}
that.refresh();
});
// if mouse moves between mousedown and mouseup (drag) set clickDragged flag
// prevents issue where button state changes but checkbox/radio checked state
// does not in Firefox (see ticket #6970)
this.buttonElement
.bind( "mousedown" + this.eventNamespace, function( event ) {
if ( options.disabled ) {
return;
}
clickDragged = false;
startXPos = event.pageX;
startYPos = event.pageY;
})
.bind( "mouseup" + this.eventNamespace, function( event ) {
if ( options.disabled ) {
return;
}
if ( startXPos !== event.pageX || startYPos !== event.pageY ) {
clickDragged = true;
}
});
}
if ( this.type === "checkbox" ) {
this.buttonElement.bind( "click" + this.eventNamespace, function() {
if ( options.disabled || clickDragged ) {
if ( options.disabled ) {
return false;
}
});
} else if ( this.type === "radio" ) {
this.buttonElement.bind( "click" + this.eventNamespace, function() {
if ( options.disabled || clickDragged ) {
if ( options.disabled ) {
return false;
}
$( this ).addClass( "ui-state-active" );

0 comments on commit 8b64322

Please sign in to comment.