Fix the low percentage problem for Saturation

casesandberg · Aug 17, 2015 · 6570053 · 6570053
1 parent 9980a70
commit 6570053
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/modules/tinycolor2/index.js b/modules/tinycolor2/index.js
@@ -317,8 +317,8 @@ function inputToRGB(color) {
 						format = String(color.r).substr(-1) === "%" ? "prgb" : "rgb";
 				}
 				else if (color.hasOwnProperty("h") && color.hasOwnProperty("s") && color.hasOwnProperty("v")) {
-						color.s = convertToPercentage(color.s);
-						color.v = convertToPercentage(color.v);
+						color.s = convertToPercentage(color.s, 1);
+						color.v = convertToPercentage(color.v, 1);
 						rgb = hsvToRgb(color.h, color.s, color.v);
 						ok = true;
 						format = "hsv";
@@ -1020,9 +1020,10 @@ function pad2(c) {
 }
 
 // Replace a decimal with it's percentage value
-function convertToPercentage(n) {
+function convertToPercentage(n, multiplier) {
+		multiplier = multiplier || 100;
 		if (n <= 1) {
-				n = (n * 100) + "%";
+				n = (n * multiplier) + "%";
 		}
 
 		return n;