Skip to content

I
i20rzslider
Commit 72c7e74c authored by Valentin Hervieu's avatar Valentin Hervieu
Browse files
Options

Improve behavior when scope value is out of slider range 

Implement the solution described in #159 .
parent 271b4967
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 23 deletions
dist/rzslider.js
View file @ 72c7e74c
......@@ -568,23 +568,15 @@
this.step = +this.options.step;
this.precision = +this.options.precision;
this.scope.rzSliderModel = this.roundStep(this.scope.rzSliderModel);
if (this.range)
this.scope.rzSliderHigh = this.roundStep(this.scope.rzSliderHigh);
this.minValue = this.roundStep(+this.options.floor);
if (this.scope.rzSliderModel < this.minValue)
this.scope.rzSliderModel = this.minValue;
if (this.range && this.scope.rzSliderHigh < this.minValue)
this.scope.rzSliderHigh = this.minValue;
if (this.options.ceil) {
if (this.options.ceil)
this.maxValue = this.roundStep(+this.options.ceil);
if (this.scope.rzSliderModel > this.maxValue)
this.scope.rzSliderModel = this.maxValue;
if (this.range && this.scope.rzSliderHigh > this.maxValue)
this.scope.rzSliderHigh = this.maxValue;
}
else
this.maxValue = this.options.ceil = this.range ? this.scope.rzSliderHigh : this.scope.rzSliderModel;
......@@ -957,7 +949,18 @@
* @returns {number}
*/
valueToOffset: function(val) {
return (val - this.minValue) * this.maxLeft / this.valueRange || 0;
return (this.sanitizeOffsetValue(val) - this.minValue) * this.maxLeft / this.valueRange || 0;
},
/**
* Ensure that the position rendered is within the slider bounds, even if the value is not
*
* @param {number} val
* @returns {number}
*/
sanitizeOffsetValue: function(val)
{
return Math.min(Math.max(val, this.minValue), this.maxValue);
},
/**
......
dist/rzslider.min.js
View file @ 72c7e74c
This diff is collapsed.
src/rzslider.js
View file @ 72c7e74c
......@@ -568,23 +568,15 @@
this.step = +this.options.step;
this.precision = +this.options.precision;
this.scope.rzSliderModel = this.roundStep(this.scope.rzSliderModel);
if (this.range)
this.scope.rzSliderHigh = this.roundStep(this.scope.rzSliderHigh);
this.minValue = this.roundStep(+this.options.floor);
if (this.scope.rzSliderModel < this.minValue)
this.scope.rzSliderModel = this.minValue;
if (this.range && this.scope.rzSliderHigh < this.minValue)
this.scope.rzSliderHigh = this.minValue;
if (this.options.ceil) {
if (this.options.ceil)
this.maxValue = this.roundStep(+this.options.ceil);
if (this.scope.rzSliderModel > this.maxValue)
this.scope.rzSliderModel = this.maxValue;
if (this.range && this.scope.rzSliderHigh > this.maxValue)
this.scope.rzSliderHigh = this.maxValue;
}
else
this.maxValue = this.options.ceil = this.range ? this.scope.rzSliderHigh : this.scope.rzSliderModel;
......@@ -957,7 +949,18 @@
* @returns {number}
*/
valueToOffset: function(val) {
return (val - this.minValue) * this.maxLeft / this.valueRange || 0;
return (this.sanitizeOffsetValue(val) - this.minValue) * this.maxLeft / this.valueRange || 0;
},
/**
* Ensure that the position rendered is within the slider bounds, even if the value is not
*
* @param {number} val
* @returns {number}
*/
sanitizeOffsetValue: function(val)
{
return Math.min(Math.max(val, this.minValue), this.maxValue);
},
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment