diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-01-02 19:38:55 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-01-02 19:38:55 +0100 |
| commit | 1ba02e9c5fc96bfcdd82e6a72369f54a30a47ecb (patch) | |
| tree | e21226ccc9b62a6a4a03fd4b7c7d62b889bd6aa7 /ui/jquery.ui.spinner.js | |
| parent | 2eb92232f3c0fa7b6643dce9197dae48f5b174ef (diff) | |
| parent | 18b8ffd796ba557a7c939d67a1551b54402a7eb9 (diff) | |
| download | jquery-ui-1ba02e9c5fc96bfcdd82e6a72369f54a30a47ecb.tar.gz jquery-ui-1ba02e9c5fc96bfcdd82e6a72369f54a30a47ecb.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.spinner.js')
| -rw-r--r-- | ui/jquery.ui.spinner.js | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index 406eefb91..1881c99ed 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -368,6 +368,14 @@ $.widget( "ui.spinner", { value = this._parse( value ); } } + if ( key === "icons" ) { + this.buttons.first().find( ".ui-icon" ) + .removeClass( this.options.icons.up ) + .addClass( value.up ); + this.buttons.last().find( ".ui-icon" ) + .removeClass( this.options.icons.down ) + .addClass( value.down ); + } this._super( key, value ); @@ -445,14 +453,20 @@ $.widget( "ui.spinner", { this._stepUp( steps ); }), _stepUp: function( steps ) { - this._spin( (steps || 1) * this.options.step ); + if ( this._start() ) { + this._spin( (steps || 1) * this.options.step ); + this._stop(); + } }, stepDown: modifier(function( steps ) { this._stepDown( steps ); }), _stepDown: function( steps ) { - this._spin( (steps || 1) * -this.options.step ); + if ( this._start() ) { + this._spin( (steps || 1) * -this.options.step ); + this._stop(); + } }, pageUp: modifier(function( pages ) { |