Skip to content

Slider: extract distance calculation logic into dedicated methods #1407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Slider: extract distance calculation logic into dedicated methods #1407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d1cff0
Slider: extract distance calculation logic into dedicated methods
Dec 30, 2014
e591eff
Slider: extract distance calculation logic into dedicated methods
Dec 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion tests/unit/slider/slider_common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ TestHelpers.commonWidgetTests( "slider", {
change: null,
slide: null,
start: null,
stop: null
stop: null,

calculateDistance: null,
calculateValue: null
}
});
58 changes: 44 additions & 14 deletions ui/slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ return $.widget( "ui.slider", $.ui.mouse, {
change: null,
slide: null,
start: null,
stop: null
stop: null,

calculateDistance: null,
calculateValue: null
},

// number of pages in a slider
Expand All @@ -65,6 +68,14 @@ return $.widget( "ui.slider", $.ui.mouse, {
this._mouseInit();
this._calculateNewMax();

if ( !$.isFunction(this.options.calculateDistance) ) {
this.options.calculateDistance = this._calculateDistance;
}

if ( !$.isFunction(this.options.callculateValue) ) {
this.options.calculateValue = this._calculateValue;
}

this.element
.addClass( "ui-slider" +
" ui-slider-" + this.orientation +
Expand Down Expand Up @@ -272,8 +283,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
var pixelTotal,
pixelMouse,
percentMouse,
valueTotal,
valueMouse;
value;

if ( this.orientation === "horizontal" ) {
pixelTotal = this.elementSize.width;
Expand All @@ -294,10 +304,9 @@ return $.widget( "ui.slider", $.ui.mouse, {
percentMouse = 1 - percentMouse;
}

valueTotal = this._valueMax() - this._valueMin();
valueMouse = this._valueMin() + percentMouse * valueTotal;
value = this.options.calculateValue(this._valueMin(), this._valueMax(), percentMouse * 100);

return this._trimAlignValue( valueMouse );
return this._trimAlignValue( value );
},

_start: function( event, index ) {
Expand Down Expand Up @@ -565,7 +574,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
},

_refreshValue: function() {
var lastValPercent, valPercent, value, valueMin, valueMax,
var lastValPercent, valPercent,
oRange = this.options.range,
o = this.options,
that = this,
Expand All @@ -574,7 +583,7 @@ return $.widget( "ui.slider", $.ui.mouse, {

if ( this.options.values && this.options.values.length ) {
this.handles.each(function( i ) {
valPercent = ( that.values(i) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100;
valPercent = that.options.calculateDistance(that._valueMin(), that._valueMax(), that.values(i));
_set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
if ( that.options.range === true ) {
Expand All @@ -597,12 +606,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
lastValPercent = valPercent;
});
} else {
value = this.value();
valueMin = this._valueMin();
valueMax = this._valueMax();
valPercent = ( valueMax !== valueMin ) ?
( value - valueMin ) / ( valueMax - valueMin ) * 100 :
0;
valPercent = that.options.calculateDistance(this._valueMin(), this._valueMax(), this.value());
_set[ this.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );

Expand Down Expand Up @@ -698,6 +702,32 @@ return $.widget( "ui.slider", $.ui.mouse, {
$( event.target ).removeClass( "ui-state-active" );
}
}
},

/**
* Calculates the distance (as percentage) of the handle based on provided value and boundaries
*
* @param {Number} min Minimum value boundary
* @param {Number} max Maximum value boundary
* @param {Number} value Slider's value
*
* @returns {Number}
*/
_calculateDistance: function( min, max, value ) {
return max !== min ? ( value - min ) / ( max - min ) * 100 : 0;
},

/**
* Calculates the value based on provided boundaries and distance
*
* @param {Number} min Minimum value boundary
* @param {Number} max Maximum value boundary
* @param {Number} distance Distance as percentage
*
* @returns {Number}
*/
_calculateValue: function( min, max, distance ) {
return min + ( distance / 100 ) * ( max - min );
}
});

Expand Down