From 622959b0116d7af0a0b642c4940cd8c0bdd88094 Mon Sep 17 00:00:00 2001
From: Mukul Hase <mukulhase@gmail.com>
Date: Fri, 12 Feb 2016 00:59:54 +0530
Subject: Slider: Fixed max value miscalculation

Fixes #12852
Closes gh-1664

(cherry picked from commit a1905e2c5ed6e61e6a7206e005de9dda4f7135d0)
---
 tests/unit/slider/slider_options.js | 25 +++++++++++++++++++++----
 ui/slider.js                        |  7 ++++++-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/tests/unit/slider/slider_options.js b/tests/unit/slider/slider_options.js
index 2badcc566..7f6591684 100644
--- a/tests/unit/slider/slider_options.js
+++ b/tests/unit/slider/slider_options.js
@@ -40,7 +40,7 @@ test( "disabled", function(){
 });
 
 test( "max", function() {
-	expect( 5 );
+	expect( 7 );
 	element = $( "<div></div>" );
 
 	options = {
@@ -54,7 +54,7 @@ test( "max", function() {
 	element.slider( options );
 	ok( element.slider( "option", "value" ) === options.value, "value option is not contained by max" );
 	ok( element.slider( "value" ) === options.max, "value method is contained by max" );
-	
+
 	options = {
 		max: 9,
 		min: 1,
@@ -65,7 +65,7 @@ test( "max", function() {
 
 	element.slider( options );
 	ok( element.slider( "value" ) === 7, "value method is within max, edge Case" );
-	
+
 	options.step = 2;
 
 	element.slider( options );
@@ -84,7 +84,24 @@ test( "max", function() {
 	ok( element.slider( "value" ) === options.max, "value method will max, step is changed and step is float" );
 	element.slider( "destroy" );
 
-});
+	options = {
+		max: 10.75,
+		min: 1.22,
+		orientation: "horizontal",
+		step: 0.01,
+		value: 10.75
+	};
+
+	element.slider( options );
+	ok( element.slider( "value" ) === options.max, "value method will max, step is changed, step is float and max is float" );
+	element.slider( "destroy" );
+
+	options.max = 10.749999999;
+
+	element.slider( options );
+	ok( element.slider( "value" ) === 10.74, "value method will max, step is changed, step is float, max is float and not divisible" );
+	element.slider( "destroy" );
+} );
 
 test( "min", function() {
 	expect( 2 );
diff --git a/ui/slider.js b/ui/slider.js
index 24ab6e167..5ee9c8236 100644
--- a/ui/slider.js
+++ b/ui/slider.js
@@ -552,8 +552,13 @@ return $.widget( "ui.slider", $.ui.mouse, {
 		var max = this.options.max,
 			min = this._valueMin(),
 			step = this.options.step,
-			aboveMin = Math.floor( ( +( max - min ).toFixed( this._precision() ) ) / step ) * 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
+			max -= step;
+		}
 		this.max = parseFloat( max.toFixed( this._precision() ) );
 	},
 
-- 
cgit v1.2.3