fix trailing zero with non-zero value

cssnano · Feb 26, 2017 · 8717071 · 8717071
1 parent d3ac55d
commit 8717071
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/packages/postcss-convert-values/index.js b/packages/postcss-convert-values/index.js
@@ -20,14 +20,19 @@ function durationOptimiser (value) {
 
 function lengthOptimiser (value, prop) {
     if (length.test(value)) {
-        var isZero = false;
-        value = value.replace(length, function (_, num, unit) {
-            isZero = parseFloat(num) === 0;
-            return converter(num, unit);
-        });
-        if (!~prop.indexOf('flex') && isZero) {
-            return '0';
+        var match = value.match(length),
+            num = match[1],
+            integer = parseInt(num),
+            unit = match[2];
+        if (parseFloat(num) === integer) {
+            num = integer;
+        }
+        if (num !== 0) {
+            num = converter(num, unit);
+        } else if (~prop.indexOf('flex')) {
+            return value;
         }
+        return num;
     }
     return value;
 }

diff --git a/packages/postcss-convert-values/test.js b/packages/postcss-convert-values/test.js
@@ -43,6 +43,10 @@ var tests = [{
     message: 'should trim trailing zeros + unit',
     fixture: 'h1{width:0.00px}',
     expected: 'h1{width:0}'
+}, {
+    message: 'should trim trailing zeros without unit',
+    fixture: 'h1{width:100.00%}',
+    expected: 'h1{width:100%}'
 }, {
     message: 'should not mangle flex basis',
     fixture: 'h1{flex-basis:0%}',