From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 6 Aug 2011 19:32:19 +0000 (-0400)
Subject: Spinner: Only trigger change when the field has blurred and the value has changed.
X-Git-Tag: 1.9m6~64
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2b22bbdd6a5ed5206f90c29ab4bfc9d9a84b6835;p=jquery-ui.git

Spinner: Only trigger change when the field has blurred and the value has changed.
---

diff --git a/tests/unit/spinner/spinner_events.js b/tests/unit/spinner/spinner_events.js
index c0771ca2f..0f64067d7 100644
--- a/tests/unit/spinner/spinner_events.js
+++ b/tests/unit/spinner/spinner_events.js
@@ -57,6 +57,7 @@ test("change", function() {
 	});
 
 	simulateKeyDownUp(el, $.ui.keyCode.UP);
+	el.blur();
 	
 	equals(change, 1, "Change triggered");
 });
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index da140308e..b090c6122 100644
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -72,14 +72,10 @@ $.widget( "ui.spinner", {
 					event.preventDefault();
 				}
 			},
-			keyup: function( event ) {
-				if ( this.spinning ) {
-					this._stop( event );
-					this._change( event );
-				}
-			},
+			keyup: "_stop",
 			focus: function() {
 				uiSpinner.addClass( "ui-state-active" );
+				this.previous = this.options.value;
 			},
 			blur: function( event ) {
 				// don't clear invalid values on blur
@@ -90,6 +86,9 @@ $.widget( "ui.spinner", {
 					this.element.val( value );
 				}
 				uiSpinner.removeClass( "ui-state-active" );
+				if ( this.previous !== this.options.value ) {
+					this._trigger( "change", event );
+				}
 			}
 		});
 
@@ -112,13 +111,7 @@ $.widget( "ui.spinner", {
 
 				this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
 			},
-			mouseup: function( event ) {
-				if ( this.spinning ) {
-					this._stop( event );
-					// TODO: don't trigger change until the field is blurred
-					this._change( event );
-				}
-			},
+			mouseup: "_stop",
 			mouseenter: function( event ) {
 				// button will add ui-state-active if mouse was down while mouseleave and kept down
 				if ( !$( event.currentTarget ).hasClass( "ui-state-active" ) ) {
@@ -133,12 +126,7 @@ $.widget( "ui.spinner", {
 			// TODO: do we really want to consider this a stop?
 			// shouldn't we just stop the repeater and wait until mouseup before
 			// we trigger the stop event?
-			mouseleave: function( event ) {
-				if ( this.spinning ) {
-					this._stop( event );
-					this._change( event );
-				}
-			}
+			mouseleave: "_stop"
 		});
 
 		// disable spinner if element was already disabled
@@ -186,12 +174,10 @@ $.widget( "ui.spinner", {
 				}
 
 				this._spin( (delta > 0 ? 1 : -1) * this.options.step, event );
-				clearTimeout( this.timeout );
-				this.timeout = setTimeout(function() {
+				clearTimeout( this.mousewheelTimer );
+				this.mousewheelTimer = setTimeout(function() {
 					if ( this.spinning ) {
 						this._stop( event );
-						// TODO: don't trigger change until the field is blurred
-						this._change( event );
 					}
 				}, 100 );
 				event.preventDefault();
@@ -276,16 +262,17 @@ $.widget( "ui.spinner", {
 	},
 
 	_stop: function( event ) {
+		if ( !this.spinning ) {
+			return;
+		}
+
 		clearTimeout( this.timer );
+		clearTimeout( this.mousewheelTimer );
 		this.counter = 0;
 		this.spinning = false;
 		this._trigger( "stop", event );
 	},
 
-	_change: function( event ) {
-		this._trigger( "change", event );
-	},
-
 	_setOption: function( key, value ) {
 		if ( key === "value") {
 			value = this._trimValue( this._parse(value) );