Merge pull request #8 from pbevin/master

Support uppercase letters in units

Author: MoOx

index.js

@@ -66,7 +66,7 @@ function reduceCSSCalc(value, decimalPrecision) {
     }
 
     // Remove units in expression:
-    var toEvaluate = expression.replace(new RegExp(unit, "g"), "")
+    var toEvaluate = expression.replace(new RegExp(unit, "gi"), "")
     var result
 
     try {
@@ -134,16 +134,18 @@ function reduceCSSCalc(value, decimalPrecision) {
 
 function getUnitsInExpression(expression) {
   var uniqueUnits = []
-  var unitRegEx = /[\.0-9]([%a-z]+)/g
+  var uniqueLowerCaseUnits = []
+  var unitRegEx = /[\.0-9]([%a-z]+)/gi
   var matches = unitRegEx.exec(expression)
 
   while (matches) {
     if (!matches || !matches[1]) {
       continue
     }
 
-    if (uniqueUnits.indexOf(matches[1]) === -1) {
+    if (uniqueLowerCaseUnits.indexOf(matches[1].toLowerCase()) === -1) {
       uniqueUnits.push(matches[1])
+      uniqueLowerCaseUnits.push(matches[1].toLowerCase())
     }
 
     matches = unitRegEx.exec(expression)

test/index.js

@@ -104,3 +104,12 @@ test("ignore unrecognized values", function(t) {
 
   t.end()
 })
+
+test("non-lowercase units", function(t) {
+  t.equal(reduceCSSCalc("calc(1PX)"), "1PX", "all uppercase");
+  t.equal(reduceCSSCalc("calc(1Px)"), "1Px", "first letter uppercase");
+  t.equal(reduceCSSCalc("calc(50% - 42Px)"), "calc(50% - 42Px)", "preserves percentage");
+  t.equal(reduceCSSCalc("calc(1Px + 1pX)"), "2Px", "combines same units mixed case");
+
+  t.end()
+})