Improve toDecimal() to support numbers or strings that are decimals

Author: ericf

index.js

@@ -53,20 +53,16 @@ function parseQuery(mediaQuery) {
     });
 }
 
-function toPx(length) {
-    var value = parseFloat(length),
-        units = String(length).match(RE_LENGTH_UNIT)[1];
+function toDecimal(ratio) {
+    var decimal = Number(ratio),
+        numbers;
 
-    switch (units) {
-        case 'em' : return value * 16;
-        case 'rem': return value * 16;
-        case 'cm' : return value * 96 / 2.54;
-        case 'mm' : return value * 96 / 2.54 / 10;
-        case 'in' : return value * 96;
-        case 'pt' : return value * 72;
-        case 'pc' : return value * 72 / 12;
-        default   : return value;
+    if (!decimal) {
+        numbers = ratio.match(/^(\d+)\s*\/\s*(\d+)$/);
+        decimal = numbers[1] / numbers[2];
     }
+
+    return decimal;
 }
 
 function toDpi(resolution) {
@@ -80,7 +76,18 @@ function toDpi(resolution) {
     }
 }
 
-function toDecimal(ratio) {
-    var numbers = ratio.match(/^(\d+)\s*\/\s*(\d+)$/);
-    return numbers[1] / numbers[2];
+function toPx(length) {
+    var value = parseFloat(length),
+        units = String(length).match(RE_LENGTH_UNIT)[1];
+
+    switch (units) {
+        case 'em' : return value * 16;
+        case 'rem': return value * 16;
+        case 'cm' : return value * 96 / 2.54;
+        case 'mm' : return value * 96 / 2.54 / 10;
+        case 'in' : return value * 96;
+        case 'pt' : return value * 72;
+        case 'pc' : return value * 72 / 12;
+        default   : return value;
+    }
 }