From 8c5a6f7241efeb285efa6b7860e3817f04dde788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Scott=20Gonz=C3=A1lez?= Date: Sun, 7 Aug 2011 19:21:23 -0400 Subject: [PATCH] Spinner: Use a polynomial instead of hard-coded blocks for incremental stepping. --- ui/jquery.ui.spinner.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index b36bdd9fd..fecaa9b05 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -239,16 +239,7 @@ $.widget( "ui.spinner", { this.counter = 1; } - // TODO refactor, maybe figure out some non-linear math - // x*x*x/50000 - x*x/500 + 17*x/200 + 1 - var newVal = this.value() + step * (this.options.incremental && - this.counter > 20 - ? this.counter > 100 - ? this.counter > 200 - ? 100 - : 10 - : 2 - : 1); + var newVal = this.value() + step * this._increment( this.counter ); // clamp the new value newVal = this._trimValue( newVal ); @@ -259,6 +250,12 @@ $.widget( "ui.spinner", { } }, + _increment: function( i ) { + return this.options.incremental ? + Math.floor( i*i*i/50000 - i*i/500 + 17*i/200 + 1 ) : + 1; + }, + _trimValue: function( value ) { var options = this.options;