aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrício Matté <ult_combo@hotmail.com>2013-10-27 00:33:25 -0200
committerScott González <scott.gonzalez@gmail.com>2013-10-29 12:51:17 -0400
commit8b64322e982e97cdfd5cdd184c8993f7123d469e (patch)
tree31d2bec24cebda52d998045818de6f01625aa308
parentf16d0c7e267794aa20411581b15870d9babd7930 (diff)
downloadjquery-ui-8b64322e982e97cdfd5cdd184c8993f7123d469e.tar.gz
jquery-ui-8b64322e982e97cdfd5cdd184c8993f7123d469e.zip
Button: Remove obsolete mouse click coordinates checking. Fixed #7665 - Button: Radio button & checkboxes ignore mouseclicks for minor mouse movements.
-rw-r--r--ui/jquery.ui.button.js29
1 files changed, 3 insertions, 26 deletions
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index ae3b86ae9..6bde7863f 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -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" );