Spinner: Fixed double firing of change event when setting the value option directly.

diff --git a/demos/spinner/default.html b/demos/spinner/default.html
index 35445a0e132b77427ce0c672bc530c9444c627f2..53fd81bf5cb1295fa2c52803feb7f79ea8b1bc44 100644 (file)
--- a/demos/spinner/default.html
+++ b/demos/spinner/default.html
@@ -6,6 +6,7 @@
        <link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" />
        <script type="text/javascript" src="../../jquery-1.6.2.js"></script>
        <script type="text/javascript" src="../../external/jquery.mousewheel-3.0.4.js"></script>
+       <script type="text/javascript" src="../../external/jquery.global.js"></script>
        <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
        <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
        <script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
@@ -13,7 +14,11 @@
        <link type="text/css" href="../demos.css" rel="stylesheet" />
        <script type="text/javascript">
        $(function() {
-               $("#spinner").spinner();
+               $("#spinner").spinner({
+                       change: function() {
+                               console.log( "change" );
+                       }
+               });
                
                $("#disable").toggle(function() {
                        $("#spinner").spinner("disable");

diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js
index 6004f0bc6af412f00e6bf8925d12921246bd5519..71f6a2332393c1c440868c363a45ffb959609439 100644 (file)
--- a/ui/jquery.ui.spinner.js
+++ b/ui/jquery.ui.spinner.js
@@ -287,7 +287,7 @@ $.widget( "ui.spinner", {
 
        _setOption: function( key, value ) {
                if ( key === "value" ) {
-                       return this._setOptionValue( value );
+                       return this._value( value );
                }
 
                this._super( "_setOption", key, value );
@@ -303,14 +303,6 @@ $.widget( "ui.spinner", {
                }
        },
 
-       _setOptionValue: function( value ) {
-               var previous = this.options.value;
-               this._value( value );
-               if ( previous !== this.options.value ) {
-                       this._trigger( "change" );
-               }
-       },
-
        _setOptions: modifier(function( options ) {
                this._super( "_setOptions", options );
 
@@ -342,6 +334,7 @@ $.widget( "ui.spinner", {
        _value: function( value ) {
                this.options.value = this._trimValue( this._parse(value) );
                this._format();
+               this._aria();
        },
 
        destroy: function() {