Skip to content

#15262: Round calculated max before compare with max from options. #1940

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

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

#15262: Round calculated max before compare with max from options. #1940

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
88f7feb
#15262: Round calculated max before compare with max from options.
tkiseleva Dec 14, 2020
3304b54
#15262: Correct codestyle.
tkiseleva Dec 14, 2020
0f3a8fa
#15262: Correct logic to cover failed test.
tkiseleva Dec 14, 2020
587371f
#15262: Correct codestyle.
tkiseleva Dec 14, 2020
aa710e9
#15262: Correct codestyle.
tkiseleva Dec 14, 2020
6c2c424
#15262: Add option which allow to define if max should be covered or …
tkiseleva Dec 18, 2020
03ccd34
#15262: Correct codestyle.
tkiseleva Dec 18, 2020
204fcb1
#15262: Correct logic for cover tests.
tkiseleva Dec 18, 2020
c234a2b
#15262: Correct logic for cover tests.
tkiseleva Dec 18, 2020
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
20 changes: 17 additions & 3 deletions ui/widgets/slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ return $.widget( "ui.slider", $.ui.mouse, {
},
distance: 0,
max: 100,
includeMax: false,
min: 0,
orientation: "horizontal",
range: false,
Expand Down Expand Up @@ -550,12 +551,25 @@ return $.widget( "ui.slider", $.ui.mouse, {
step = this.options.step,
aboveMin = Math.round( ( max - min ) / step ) * step;
max = aboveMin + min;
if ( max > this.options.max ) {

//If max is not divisible by step, rounding off may increase its value
// Round the max before compare with max from option.
max = parseFloat( max.toFixed( this._precision() ) );
var optionMax = parseFloat( this.options.max.toFixed( this._precision() ) );

if ( this.options.includeMax && this.options.includeMax === true) {
if ( max < optionMax ) {

// If max is not divisible by step and max from options
// should be covered, add one more step.
max += step;
}
} else if ( max > optionMax ) {

// If max is not divisible by step, rounding off may increase its value
max -= step;
}
this.max = parseFloat( max.toFixed( this._precision() ) );

this.max = max;
},

_precision: function() {
Expand Down