Spinner: Trigger start/spin/stop events when calling step/page methods. Fixes #8901 - Spinner does not fire start/spin/stop events when calling stepUp()/Down(), pageUp()/Down() methods

This commit is contained in:
Jörn Zaefferer 2012-12-27 17:05:25 +01:00
parent 1045d3a352
commit 0d53fbfd0b
2 changed files with 23 additions and 17 deletions

View File

@ -5,7 +5,7 @@ var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
module( "spinner: events" );
test( "start", function() {
expect( 6 );
expect( 10 );
var element = $( "#spin" ).spinner();
function shouldStart( expectation, msg ) {
@ -29,14 +29,14 @@ test( "start", function() {
shouldStart( true, "button down" );
element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
shouldStart( false, "stepUp" );
shouldStart( true, "stepUp" );
element.spinner( "stepUp" );
shouldStart( false, "stepDown" );
shouldStart( true, "stepDown" );
element.spinner( "stepDown" );
shouldStart( false, "pageUp" );
shouldStart( true, "pageUp" );
element.spinner( "pageUp" );
shouldStart( false, "pageDown" );
shouldStart( true, "pageDown" );
element.spinner( "pageDown" );
shouldStart( false, "value" );
@ -44,7 +44,7 @@ test( "start", function() {
});
test( "spin", function() {
expect( 6 );
expect( 10 );
var element = $( "#spin" ).spinner();
function shouldSpin( expectation, msg ) {
@ -68,14 +68,14 @@ test( "spin", function() {
shouldSpin( true, "button down" );
element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
shouldSpin( false, "stepUp" );
shouldSpin( true, "stepUp" );
element.spinner( "stepUp" );
shouldSpin( false, "stepDown" );
shouldSpin( true, "stepDown" );
element.spinner( "stepDown" );
shouldSpin( false, "pageUp" );
shouldSpin( true, "pageUp" );
element.spinner( "pageUp" );
shouldSpin( false, "pageDown" );
shouldSpin( true, "pageDown" );
element.spinner( "pageDown" );
shouldSpin( false, "value" );
@ -83,7 +83,7 @@ test( "spin", function() {
});
test( "stop", function() {
expect( 6 );
expect( 10 );
var element = $( "#spin" ).spinner();
function shouldStop( expectation, msg ) {
@ -107,14 +107,14 @@ test( "stop", function() {
shouldStop( true, "button down" );
element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
shouldStop( false, "stepUp" );
shouldStop( true, "stepUp" );
element.spinner( "stepUp" );
shouldStop( false, "stepDown" );
shouldStop( true, "stepDown" );
element.spinner( "stepDown" );
shouldStop( false, "pageUp" );
shouldStop( true, "pageUp" );
element.spinner( "pageUp" );
shouldStop( false, "pageDown" );
shouldStop( true, "pageDown" );
element.spinner( "pageDown" );
shouldStop( false, "value" );

View File

@ -453,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 ) {